394 files changed, 39859 insertions, 35127 deletions

diff --git a/.travis.yml b/.travis.yml
index 4684b3f..5f5ee4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,6 @@ matrix:
       compiler:
       addons:
       before_install:
-      before_script:
       script:
         - >
           test "$TRAVIS_REPO_SLUG" != "git/git" ||
@@ -46,7 +45,6 @@ matrix:
       services:
         - docker
       before_install:
-      before_script:
       script: ci/run-linux32-docker.sh
     - env: jobname=StaticAnalysis
       os: linux
@@ -56,7 +54,6 @@ matrix:
           packages:
           - coccinelle
       before_install:
-      before_script:
       script: ci/run-static-analysis.sh
       after_failure:
     - env: jobname=Documentation
@@ -68,13 +65,11 @@ matrix:
           - asciidoc
           - xmlto
       before_install:
-      before_script:
       script: ci/test-documentation.sh
       after_failure:
 
 before_install: ci/install-dependencies.sh
-before_script: ci/run-build.sh
-script: ci/run-tests.sh
+script: ci/run-build-and-tests.sh
 after_failure: ci/print-test-failures.sh
 
 notifications:
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index c4cb5ff..48aa4ed 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -386,6 +386,11 @@ For C programs:
  - Use Git's gettext wrappers to make the user interface
    translatable. See "Marking strings for translation" in po/README.
 
+ - Variables and functions local to a given source file should be marked
+   with "static". Variables that are visible to other source files
+   must be declared with "extern" in header files. However, function
+   declarations should not use "extern", as that is already the default.
+
 For Perl programs:
 
  - Most of the C guidelines above apply.
diff --git a/Documentation/RelNotes/2.16.2.txt b/Documentation/RelNotes/2.16.2.txt
new file mode 100644
index 0000000..a216466
--- /dev/null
+++ b/Documentation/RelNotes/2.16.2.txt
@@ -0,0 +1,30 @@
+Git v2.16.2 Release Notes
+=========================
+
+Fixes since v2.16.1
+-------------------
+
+ * An old regression in "git describe --all $annotated_tag^0" has been
+   fixed.
+
+ * "git svn dcommit" did not take into account the fact that a
+   svn+ssh:// URL with a username@ (typically used for pushing) refers
+   to the same SVN repository without the username@ and failed when
+   svn.pushmergeinfo option is set.
+
+ * "git merge -Xours/-Xtheirs" learned to use our/their version when
+   resolving a conflicting updates to a symbolic link.
+
+ * "git clone $there $here" is allowed even when here directory exists
+   as long as it is an empty directory, but the command incorrectly
+   removed it upon a failure of the operation.
+
+ * "git stash -- <pathspec>" incorrectly blew away untracked files in
+   the directory that matched the pathspec, which has been corrected.
+
+ * "git add -p" was taught to ignore local changes to submodules as
+   they do not interfere with the partial addition of regular changes
+   anyway.
+
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.16.3.txt b/Documentation/RelNotes/2.16.3.txt
new file mode 100644
index 0000000..64a0bcb
--- /dev/null
+++ b/Documentation/RelNotes/2.16.3.txt
@@ -0,0 +1,49 @@
+Git v2.16.3 Release Notes
+=========================
+
+Fixes since v2.16.2
+-------------------
+
+ * "git status" after moving a path in the working tree (hence making
+   it appear "removed") and then adding with the -N option (hence
+   making that appear "added") detected it as a rename, but did not
+   report the  old and new pathnames correctly.
+
+ * "git commit --fixup" did not allow "-m<message>" option to be used
+   at the same time; allow it to annotate resulting commit with more
+   text.
+
+ * When resetting the working tree files recursively, the working tree
+   of submodules are now also reset to match.
+
+ * Fix for a commented-out code to adjust it to a rather old API change
+   around object ID.
+
+ * When there are too many changed paths, "git diff" showed a warning
+   message but in the middle of a line.
+
+ * The http tracing code, often used to debug connection issues,
+   learned to redact potentially sensitive information from its output
+   so that it can be more safely sharable.
+
+ * Crash fix for a corner case where an error codepath tried to unlock
+   what it did not acquire lock on.
+
+ * The split-index mode had a few corner case bugs fixed.
+
+ * Assorted fixes to "git daemon".
+
+ * Completion of "git merge -s<strategy>" (in contrib/) did not work
+   well in non-C locale.
+
+ * Workaround for segfault with more recent versions of SVN.
+
+ * Recently introduced leaks in fsck have been plugged.
+
+ * Travis CI integration now builds the executable in 'script' phase
+   to follow the established practice, rather than during
+   'before_script' phase.  This allows the CI categorize the failures
+   better ('failed' is project's fault, 'errored' is build
+   environment's).
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt
index e1e509b..d6db0e1 100644
--- a/Documentation/RelNotes/2.17.0.txt
+++ b/Documentation/RelNotes/2.17.0.txt
@@ -8,20 +8,92 @@ UI, Workflows & Features
 
  * "diff" family of commands learned "--find-object=<object-id>" option
    to limit the findings to changes that involve the named object.
-   (merge 4d8c51aa19 sb/diff-blobfind-pickaxe later to maint).
+
+ * "git format-patch" learned to give 72-cols to diffstat, which is
+   consistent with other line length limits the subcommand uses for
+   its output meant for e-mails.
+
+ * The log from "git daemon" can be redirected with a new option; one
+   relevant use case is to send the log to standard error (instead of
+   syslog) when running it from inetd.
+
+ * "git rebase" learned to take "--allow-empty-message" option.
+
+ * "git am" has learned the "--quit" option, in addition to the
+   existing "--abort" option; having the pair mirrors a few other
+   commands like "rebase" and "cherry-pick".
+
+ * "git worktree add" learned to run the post-checkout hook, just like
+   "git clone" runs it upon the initial checkout.
+
+ * "git tag" learned an explicit "--edit" option that allows the
+   message given via "-m" and "-F" to be further edited.
+
+ * "git fetch --prune-tags" may be used as a handy short-hand for
+   getting rid of stale tags that are locally held.
+
+ * The new "--show-current-patch" option gives an end-user facing way
+   to get the diff being applied when "git rebase" (and "git am")
+   stops with a conflict.
+
+ * "git add -p" used to offer "/" (look for a matching hunk) as a
+   choice, even there was only one hunk, which has been corrected.
+   Also the single-key help is now given only for keys that are
+   enabled (e.g. help for '/' won't be shown when there is only one
+   hunk).
+
+ * Since Git 1.7.9, "git merge" defaulted to --no-ff (i.e. even when
+   the side branch being merged is a descendant of the current commit,
+   create a merge commit instead of fast-forwarding) when merging a
+   tag object.  This was appropriate default for integrators who pull
+   signed tags from their downstream contributors, but caused an
+   unnecessary merges when used by downstream contributors who
+   habitually "catch up" their topic branches with tagged releases
+   from the upstream.  Update "git merge" to default to --no-ff only
+   when merging a tag object that does *not* sit at its usual place in
+   refs/tags/ hierarchy, and allow fast-forwarding otherwise, to
+   mitigate the problem.
+
+ * "git status" can spend a lot of cycles to compute the relation
+   between the current branch and its upstream, which can now be
+   disabled with "--no-ahead-behind" option.
+
+ * "git diff" and friends learned funcname patterns for Go language
+   source files.
+
+ * "git send-email" learned "--reply-to=<address>" option.
+
+ * Funcname pattern used for C# now recognizes "async" keyword.
+
+ * In a way similar to how "git tag" learned to honor the pager
+   setting only in the list mode, "git config" learned to ignore the
+   pager setting when it is used for setting values (i.e. when the
+   purpose of the operation is not to "show").
 
 
 Performance, Internal Implementation, Development Support etc.
 
  * More perf tests for threaded grep
-   (merge 7b31b55db1 ab/perf-grep-threads later to maint).
 
  * "perf" test output can be sent to codespeed server.
-   (merge 19cf57a92e cc/codespeed later to maint).
 
  * The build procedure for perl/ part has been greatly simplified by
    weaning ourselves off of MakeMaker.
 
+ * Perl 5.8 or greater has been required since Git 1.7.4 released in
+   2010, but we continued to assume some core modules may not exist and
+   used a conditional "eval { require <<module>> }"; we no longer do
+   this.  Some platforms (Fedora/RedHat/CentOS, for example) ship Perl
+   without all core modules by default (e.g. Digest::MD5, File::Temp,
+   File::Spec, Net::Domain, Net::SMTP).  Users on such platforms may
+   need to install these additional modules.
+
+ * As a convenience, we install copies of Perl modules we require which
+   are not part of the core Perl distribution (e.g. Error and
+   Mail::Address).  Users and packagers whose operating system provides
+   these modules can set NO_PERL_CPAN_FALLBACKS to avoid installing the
+   bundled modules.
+
  * In preparation for implementing narrow/partial clone, the machinery
    for checking object connectivity used by gc and fsck has been
    taught that a missing object is OK when it is referenced by a
@@ -44,13 +116,10 @@ Performance, Internal Implementation, Development Support etc.
 
  * The tracing machinery learned to report tweaking of environment
    variables as well.
-   (merge 090a09272a nd/trace-with-env later to maint).
 
  * Update Coccinelle rules to catch and optimize strbuf_addf(&buf, "%s", str)
-   (merge cd9a4b6d93 rs/strbuf-cocci-workaround later to maint).
 
  * Prevent "clang-format" from breaking line after function return type.
-   (merge a3715d43e8 po/clang-format-functype-weight later to maint).
 
  * The sequencer infrastructure is shared across "git cherry-pick",
    "git rebase -i", etc., and has always spawned "git commit" when it
@@ -59,6 +128,40 @@ Performance, Internal Implementation, Development Support etc.
    gives performance boost for a few tens of percents in some sample
    scenarios.
 
+ * Push the submodule version of collision-detecting SHA-1 hash
+   implementation a bit harder on builders.
+
+ * Avoid mmapping small files while using packed refs (especially ones
+   with zero size, which would cause later munmap() to fail).
+
+ * Conversion from uchar[20] to struct object_id continues.
+
+ * More tests for wildmatch functions.
+
+ * The code to binary search starting from a fan-out table (which is
+   how the packfile is indexed with object names) has been refactored
+   into a reusable helper.
+
+ * We now avoid using identifiers that clash with C++ keywords.  Even
+   though it is not a goal to compile Git with C++ compilers, changes
+   like this help use of code analysis tools that targets C++ on our
+   codebase.
+
+ * The executable is now built in 'script' phase in Travis CI integration,
+   to follow the established practice, rather than during 'before_script'
+   phase.  This allows the CI categorize the failures better ('failed'
+   is project's fault, 'errored' is build environment's).
+   (merge 3c93b82920 sg/travis-build-during-script-phase later to maint).
+
+ * Writing out the index file when the only thing that changed in it
+   is the untracked cache information is often wasteful, and this has
+   been optimized out.
+
+ * Various pieces of Perl code we have have been cleaned up.
+
+ * Internal API clean-up to allow write_locked_index() optionally skip
+   writing the in-core index when it is not modified.
+
 
 Also contains various documentation updates and code clean-ups.
 
@@ -68,44 +171,35 @@ Fixes since v2.16
 
  * An old regression in "git describe --all $annotated_tag^0" has been
    fixed.
-   (merge 1bba00130a dk/describe-all-output-fix later to maint).
 
  * "git status" after moving a path in the working tree (hence making
    it appear "removed") and then adding with the -N option (hence
    making that appear "added") detected it as a rename, but did not
    report the  old and new pathnames correctly.
-   (merge 176ea74793 nd/ita-wt-renames-in-status later to maint).
 
  * "git svn dcommit" did not take into account the fact that a
    svn+ssh:// URL with a username@ (typically used for pushing) refers
    to the same SVN repository without the username@ and failed when
    svn.pushmergeinfo option is set.
-   (merge 8aaed892fd jm/svn-pushmergeinfo-fix later to maint).
 
  * API clean-up around revision traversal.
-   (merge 6fcec2f9ae rs/lose-leak-pending later to maint).
 
  * "git merge -Xours/-Xtheirs" learned to use our/their version when
    resolving a conflicting updates to a symbolic link.
-   (merge fd48b46474 jc/merge-symlink-ours-theirs later to maint).
 
  * "git clone $there $here" is allowed even when here directory exists
    as long as it is an empty directory, but the command incorrectly
    removed it upon a failure of the operation.
-   (merge d45420c1c8 jk/abort-clone-with-existing-dest later to maint).
 
  * "git commit --fixup" did not allow "-m<message>" option to be used
    at the same time; allow it to annotate resulting commit with more
    text.
-   (merge 30884c9afc ab/commit-m-with-fixup later to maint).
 
  * When resetting the working tree files recursively, the working tree
    of submodules are now also reset to match.
-   (merge 7dcc1f4df8 sb/submodule-update-reset-fix later to maint).
 
  * "git stash -- <pathspec>" incorrectly blew away untracked files in
    the directory that matched the pathspec, which has been corrected.
-   (merge bba067d2fa tg/stash-with-pathspec-fix later to maint).
 
  * Instead of maintaining home-grown email address parsing code, ship
    a copy of reasonably recent Mail::Address to be used as a fallback
@@ -115,7 +209,6 @@ Fixes since v2.16
  * "git add -p" was taught to ignore local changes to submodules as
    they do not interfere with the partial addition of regular changes
    anyway.
-   (merge 12434efc1d nd/add-i-ignore-submodules later to maint).
 
  * Avoid showing a warning message in the middle of a line of "git
    diff" output.
@@ -143,11 +236,124 @@ Fixes since v2.16
  * Workaround for segfault with more recent versions of SVN.
    (merge 7f6f75e97a ew/svn-branch-segfault-fix later to maint).
 
+ * Plug recently introduced leaks in fsck.
+   (merge ba3a08ca0e jt/fsck-code-cleanup later to maint).
+
+ * "git pull --rebase" did not pass verbosity setting down when
+   recursing into a submodule.
+   (merge a56771a668 sb/pull-rebase-submodule later to maint).
+
+ * The way "git reset --hard" reports the commit the updated HEAD
+   points at is made consistent with the way how the commit title is
+   generated by the other parts of the system.  This matters when the
+   title is spread across physically multiple lines.
+   (merge 1cf823fb68 tg/reset-hard-show-head-with-pretty later to maint).
+
+ * Test fixes.
+   (merge 63b1a175ee sg/test-i18ngrep later to maint).
+
+ * Some bugs around "untracked cache" feature have been fixed.  This
+   will notice corrupt data in the untracked cache left by old and
+   buggy code and issue a warning---the index can be fixed by clearing
+   the untracked cache from it.
+   (merge 0cacebf099 nd/fix-untracked-cache-invalidation later to maint).
+   (merge 7bf0be7501 ab/untracked-cache-invalidation-docs later to maint).
+
+ * "git blame HEAD COPYING" in a bare repository failed to run, while
+   "git blame HEAD -- COPYING" run just fine.  This has been corrected.
+
+ * "git add" files in the same directory, but spelling the directory
+   path in different cases on case insensitive filesystem, corrupted
+   the name hash data structure and led to unexpected results.  This
+   has been corrected.
+   (merge c95525e90d bp/name-hash-dirname-fix later to maint).
+
+ * "git rebase -p" mangled log messages of a merge commit, which is
+   now fixed.
+   (merge ed5144d7eb js/fix-merge-arg-quoting-in-rebase-p later to maint).
+
+ * Some low level protocol codepath could crash when they get an
+   unexpected flush packet, which is now fixed.
+   (merge bb1356dc64 js/packet-read-line-check-null later to maint).
+
+ * "git check-ignore" with multiple paths got confused when one is a
+   file and the other is a directory, which has been fixed.
+   (merge d60771e930 rs/check-ignore-multi later to maint).
+
+ * "git describe $garbage" stopped giving any errors when the garbage
+   happens to be a string with 40 hexadecimal letters.
+   (merge a8e7a2bf0f sb/describe-blob later to maint).
+
+ * Code to unquote single-quoted string (used in the parser for
+   configuration files, etc.) did not diagnose bogus input correctly
+   and produced bogus results instead.
+   (merge ddbbf8eb25 jk/sq-dequote-on-bogus-input later to maint).
+
+ * Many places in "git apply" knew that "/dev/null" that signals
+   "there is no such file on this side of the diff" can be followed by
+   whitespace and garbage when parsing a patch, except for one, which
+   made an otherwise valid patch (e.g. ones from subversion) rejected.
+   (merge e454ad4bec tk/apply-dev-null-verify-name-fix later to maint).
+
+ * We no longer create any *.spec file, so "make clean" should not
+   remove it.
+   (merge 4321bdcabb tz/do-not-clean-spec-file later to maint).
+
+ * "git push" over http transport did not unquote the push-options
+   correctly.
+   (merge 90dce21eb0 jk/push-options-via-transport-fix later to maint).
+
+ * "git send-email" learned to complain when the batch-size option is
+   not defined when the relogin-delay option is, since these two are
+   mutually required.
+   (merge 9caa70697b xz/send-email-batch-size later to maint).
+
+ * Y2k20 fix ;-) for our perl scripts.
+   (merge a40e06ee33 bw/perl-timegm-timelocal-fix later to maint).
+
+ * Threaded "git grep" has been optimized to avoid allocation in code
+   section that is covered under a mutex.
+   (merge 38ef24dccf rv/grep-cleanup later to maint).
+
+ * "git subtree" script (in contrib/) scripted around "git log", whose
+   output got affected by end-user configuration like log.showsignature
+   (merge 8841b5222c sg/subtree-signed-commits later to maint).
+
+ * While finding unique object name abbreviation, the code may
+   accidentally have read beyond the end of the array of object names
+   in a pack.
+   (merge 21abed500c ds/find-unique-abbrev-optim later to maint).
+
+ * Micro optimization in revision traversal code.
+   (merge ebbed3ba04 ds/mark-parents-uninteresting-optim later to maint).
+
+ * "git commit" used to run "gc --auto" near the end, which was lost
+   when the command was reimplemented in C by mistake.
+   (merge 095c741edd ab/gc-auto-in-commit later to maint).
+
+ * Allow running a couple of tests with "sh -x".
+   (merge c20bf94abc sg/cvs-tests-with-x later to maint).
+
+ * The codepath to replace an existing entry in the index had a bug in
+   updating the name hash structure, which has been fixed.
+   (merge 0e267b7a24 bp/refresh-cache-ent-rehash-fix later to maint).
+
+ * The transfer.fsckobjects configuration tells "git fetch" to
+   validate the data and connected-ness of objects in the received
+   pack; the code to perform this check has been taught about the
+   narrow clone's convention that missing objects that are reachable
+   from objects in a pack that came from a promissor remote is OK.
+
+ * There was an unused file-scope static variable left in http.c when
+   building for versions of libCURL that is older than 7.19.4, which
+   has been fixed.
+   (merge b8fd6008ec rj/http-code-cleanup later to maint).
+
+ * Shell script portability fix.
+   (merge 206a6ae013 ml/filter-branch-portability-fix later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge e2a5a028c7 bw/oidmap-autoinit later to maint).
-   (merge f0a6068a9f ys/bisect-object-id-missing-conversion-fix later to maint).
-   (merge 30221a3389 as/read-tree-prefix-doc-fix later to maint).
-   (merge 9bd2ce5432 ab/doc-cat-file-e-still-shows-errors later to maint).
    (merge ec3b4b06f8 cl/t9001-cleanup later to maint).
    (merge e1b3f3dd38 ks/submodule-doc-updates later to maint).
    (merge fbac558a9b rs/describe-unique-abbrev later to maint).
@@ -159,3 +365,34 @@ Fixes since v2.16
    (merge 4e801463c7 jc/mailinfo-cleanup-fix later to maint).
    (merge ef5b3a6c5e nd/shared-index-fix later to maint).
    (merge 9f5258cbb8 tz/doc-show-defaults-to-head later to maint).
+   (merge b780e4407d jc/worktree-add-short-help later to maint).
+   (merge ae239fc8e5 rs/cocci-strbuf-addf-to-addstr later to maint).
+   (merge 2e22a85e5c nd/ignore-glob-doc-update later to maint).
+   (merge 3738031581 jk/gettext-poison later to maint).
+   (merge 54360a1956 rj/sparse-updates later to maint).
+   (merge 12e31a6b12 sg/doc-test-must-fail-args later to maint).
+   (merge 760f1ad101 bc/doc-interpret-trailers-grammofix later to maint).
+   (merge 4ccf461f56 bp/fsmonitor later to maint).
+   (merge a6119f82b1 jk/test-hashmap-updates later to maint).
+   (merge 5aea9fe6cc rd/typofix later to maint).
+   (merge e4e5da2796 sb/status-doc-fix later to maint).
+   (merge 7976e901c8 gs/test-unset-xdg-cache-home later to maint).
+   (merge d023df1ee6 tg/worktree-create-tracking later to maint).
+   (merge 4cbe92fd41 sm/mv-dry-run-update later to maint).
+   (merge 75e5e9c3f7 sb/color-h-cleanup later to maint).
+   (merge 2708ef4af6 sg/t6300-modernize later to maint).
+   (merge d88e92d4e0 bw/doc-submodule-recurse-config-with-clone later to maint).
+   (merge f74bbc8dd2 jk/cached-commit-buffer later to maint).
+   (merge 1316416903 ms/non-ascii-ticks later to maint).
+   (merge 878056005e rs/strbuf-read-file-or-whine later to maint).
+   (merge 79f0ba1547 jk/strbuf-read-file-close-error later to maint).
+   (merge edfb8ba068 ot/ref-filter-cleanup later to maint).
+   (merge 11395a3b4b jc/test-must-be-empty later to maint).
+   (merge 768b9d6db7 mk/doc-pretty-fill later to maint).
+   (merge 2caa7b8d27 ab/man-sec-list later to maint).
+   (merge 40c17eb184 ks/t3200-typofix later to maint).
+   (merge bd9958c358 dp/merge-strategy-doc-fix later to maint).
+   (merge 9ee0540a40 js/ming-strftime later to maint).
+   (merge 1775e990f7 tz/complete-tag-delete-tagname later to maint).
+   (merge 00a4b03501 rj/warning-uninitialized-fix later to maint).
+   (merge b635ed97a0 jk/attributes-path-doc later to maint).
diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt
new file mode 100644
index 0000000..c8f76dc
--- /dev/null
+++ b/Documentation/RelNotes/2.18.0.txt
@@ -0,0 +1,92 @@
+Git 2.18 Release Notes
+======================
+
+Updates since v2.17
+-------------------
+
+UI, Workflows & Features
+
+ * Rename detection logic in "diff" family that is used in "merge" has
+   learned to guess when all of x/a, x/b and x/c have moved to z/a,
+   z/b and z/c, it is likely that x/d added in the meantime would also
+   want to move to z/d by taking the hint that the entire directory
+   'x' moved to 'z'.  A bug causing dirty files involved in a rename
+   to be overwritten during merge has also been fixed as part of this
+   work.
+
+ * "git filter-branch" learned to use a different exit code to allow
+   the callers to tell the case where there was no new commits to
+   rewrite from other error cases.
+
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * A "git fetch" from a repository with insane number of refs into a
+   repository that is already up-to-date still wasted too many cycles
+   making many lstat(2) calls to see if these objects at the tips
+   exist as loose objects locally.  These lstat(2) calls are optimized
+   away by enumerating all loose objects beforehand.
+   It is unknown if the new strategy negatively affects existing use
+   cases, fetching into a repository with many loose objects from a
+   repository with small number of refs.
+
+ * Git can be built to use either v1 or v2 of the PCRE library, and so
+   far, the build-time configuration USE_LIBPCRE=YesPlease instructed
+   the build procedure to use v1, but now it means v2.  USE_LIBPCRE1
+   and USE_LIBPCRE2 can be used to explicitly choose which version to
+   use, as before.
+
+ * The build procedure learned to optionally use symbolic links
+   (instead of hardlinks and copies) to install "git-foo" for built-in
+   commands, whose binaries are all identical.
+
+ * Conversion from uchar[20] to struct object_id continues.
+
+ * The way "git worktree prune" worked internally has been simplified,
+   by assuming how "git worktree move" moves an existing worktree to a
+   different place.
+
+ * Code clean-up for the "repository" abstraction.
+   (merge 00a3da2a13 nd/remove-ignore-env-field later to maint).
+
+ * Code to find the length to uniquely abbreviate object names based
+   on packfile content, which is a relatively recent addtion, has been
+   optimized to use the same fan-out table.
+
+ * The mechanism to use parse-options API to automate the command line
+   completion continues to get extended and polished.
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.17
+-----------------
+
+ * "git shortlog cruft" aborted with a BUG message when run outside a
+   Git repository.  The command has been taught to complain about
+   extra and unwanted arguments on its command line instead in such a
+   case.
+   (merge 4aa0161e83 ma/shortlog-revparse later to maint).
+
+ * "git stash push -u -- <pathspec>" gave an unnecessary and confusing
+   error message when there was no tracked files that match the
+   <pathspec>, which has been fixed.
+   (merge 353278687e tg/stash-untracked-with-pathspec-fix later to maint).
+
+ * "git tag --contains no-such-commit" gave a full list of options
+   after giving an error message.
+   (merge 3bb0923f06 ps/contains-id-error-message later to maint).
+
+ * "diff-highlight" filter (in contrib/) learned to undertand "git log
+   --graph" output better.
+   (merge 4551fbba14 jk/diff-highlight-graph-fix later to maint).
+
+ * when refs that do not point at committish are given, "git
+   filter-branch" gave a misleading error messages.  This has been
+   corrected.
+   (merge f78ab355e7 yk/filter-branch-non-committish-refs later to maint).
+
+ * Other minor doc, test and build updates and code cleanups.
+   (merge 248f66ed8e nd/trace-with-env later to maint).
+   (merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f57e9cf..4e0cff8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1398,7 +1398,16 @@ fetch.unpackLimit::
 
 fetch.prune::
 	If true, fetch will automatically behave as if the `--prune`
-	option was given on the command line.  See also `remote.<name>.prune`.
+	option was given on the command line.  See also `remote.<name>.prune`
+	and the PRUNING section of linkgit:git-fetch[1].
+
+fetch.pruneTags::
+	If true, fetch will automatically behave as if the
+	`refs/tags/*:refs/tags/*` refspec was provided when pruning,
+	if not set already. This allows for setting both this option
+	and `fetch.prune` to maintain a 1=1 mapping to upstream
+	refs. See also `remote.<name>.pruneTags` and the PRUNING
+	section of linkgit:git-fetch[1].
 
 fetch.output::
 	Control how ref update status is printed. Valid values are
@@ -2945,6 +2954,15 @@ remote.<name>.prune::
 	remote (as if the `--prune` option was given on the command line).
 	Overrides `fetch.prune` settings, if any.
 
+remote.<name>.pruneTags::
+	When set to true, fetching from this remote by default will also
+	remove any local tags that no longer exist on the remote if pruning
+	is activated in general via `remote.<name>.prune`, `fetch.prune` or
+	`--prune`. Overrides `fetch.pruneTags` settings, if any.
++
+See also `remote.<name>.prune` and the PRUNING section of
+linkgit:git-fetch[1].
+
 remotes.<group>::
 	The list of remotes which are fetched by "git remote update
 	<group>".  See linkgit:git-remote[1].
@@ -3210,7 +3228,8 @@ submodule.active::
 
 submodule.recurse::
 	Specifies if commands recurse into submodules by default. This
-	applies to all commands that have a `--recurse-submodules` option.
+	applies to all commands that have a `--recurse-submodules` option,
+	except `clone`.
 	Defaults to false.
 
 submodule.fetchJobs::
@@ -3345,7 +3364,7 @@ uploadpack.packObjectsHook::
 	stdout.
 
 uploadpack.allowFilter::
-	If this option is set, `upload-pack` will advertise partial
+	If this option is set, `upload-pack` will support partial
 	clone and partial fetch object filtering.
 +
 Note that this configuration variable is ignored if it is seen in the
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c330c01..e3a44f0 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -128,6 +128,14 @@ have to use `--diff-algorithm=default` option.
 These parameters can also be set individually with `--stat-width=<width>`,
 `--stat-name-width=<name-width>` and `--stat-count=<count>`.
 
+--compact-summary::
+	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 betwen the filename part and the graph
+	part. Implies `--stat`.
+
 --numstat::
 	Similar to `--stat`, but shows number of added and
 	deleted lines in decimal notation and pathname without
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index fb6bebb..8631e36 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -73,7 +73,22 @@ ifndef::git-pull[]
 	are fetched due to an explicit refspec (either on the command
 	line or in the remote configuration, for example if the remote
 	was cloned with the --mirror option), then they are also
-	subject to pruning.
+	subject to pruning. Supplying `--prune-tags` is a shorthand for
+	providing the tag refspec.
++
+See the PRUNING section below for more details.
+
+-P::
+--prune-tags::
+	Before fetching, remove any local tags that no longer exist on
+	the remote if `--prune` is enabled. This option should be used
+	more carefully, unlike `--prune` it will remove any local
+	references (local tags) that have been created. This option is
+	a shorthand for providing the explicit tag refspec along with
+	`--prune`, see the discussion about that in its documentation.
++
+See the PRUNING section below for more details.
+
 endif::git-pull[]
 
 ifndef::git-pull[]
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 12879e4..6f6c34b 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch)
 
 DESCRIPTION
 -----------
@@ -167,6 +167,14 @@ default.   You can use `--no-utf8` to override this.
 --abort::
 	Restore the original branch and abort the patching operation.
 
+--quit::
+	Abort the patching operation but keep HEAD and the index
+	untouched.
+
+--show-current-patch::
+	Show the patch being applied when "git am" is stopped because
+	of conflicts.
+
 DISCUSSION
 ----------
 
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 14da5fc..e09ed5d 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -233,6 +233,12 @@ See also <<FILES>>.
 	using `--file`, `--global`, etc) and `on` when searching all
 	config files.
 
+CONFIGURATION
+-------------
+`pager.config` is only respected when listing configuration, i.e., when
+using `--list` or any of the `--get-*` which may return multiple results.
+The default is to use a pager.
+
 [[FILES]]
 FILES
 -----
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 3c91db7..56d54a4 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -20,6 +20,7 @@ SYNOPSIS
 	     [--inetd |
 	      [--listen=<host_or_ipaddr>] [--port=<n>]
 	      [--user=<user> [--group=<group>]]]
+	     [--log-destination=(stderr|syslog|none)]
 	     [<directory>...]
 
 DESCRIPTION
@@ -80,7 +81,8 @@ OPTIONS
 	do not have the 'git-daemon-export-ok' file.
 
 --inetd::
-	Have the server run as an inetd service. Implies --syslog.
+	Have the server run as an inetd service. Implies --syslog (may be
+	overridden with `--log-destination=`).
 	Incompatible with --detach, --port, --listen, --user and --group
 	options.
 
@@ -110,8 +112,28 @@ OPTIONS
 	zero for no limit.
 
 --syslog::
-	Log to syslog instead of stderr. Note that this option does not imply
-	--verbose, thus by default only error conditions will be logged.
+	Short for `--log-destination=syslog`.
+
+--log-destination=<destination>::
+	Send log messages to the specified destination.
+	Note that this option does not imply --verbose,
+	thus by default only error conditions will be logged.
+	The <destination> must be one of:
++
+--
+stderr::
+	Write to standard error.
+	Note that if `--detach` is specified,
+	the process disconnects from the real standard error,
+	making this destination effectively equivalent to `none`.
+syslog::
+	Write to syslog, using the `git-daemon` identifier.
+none::
+	Disable all logging.
+--
++
+The default destination is `syslog` if `--inetd` or `--detach` is specified,
+otherwise `stderr`.
 
 --user-path::
 --user-path=<path>::
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index b153aef..e319935 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -99,6 +99,93 @@ The latter use of the `remote.<repository>.fetch` values can be
 overridden by giving the `--refmap=<refspec>` parameter(s) on the
 command line.
 
+PRUNING
+-------
+
+Git has a default disposition of keeping data unless it's explicitly
+thrown away; this extends to holding onto local references to branches
+on remotes that have themselves deleted those branches.
+
+If left to accumulate, these stale references might make performance
+worse on big and busy repos that have a lot of branch churn, and
+e.g. make the output of commands like `git branch -a --contains
+<commit>` needlessly verbose, as well as impacting anything else
+that'll work with the complete set of known references.
+
+These remote-tracking references can be deleted as a one-off with
+either of:
+
+------------------------------------------------
+# While fetching
+$ git fetch --prune <name>
+
+# Only prune, don't fetch
+$ git remote prune <name>
+------------------------------------------------
+
+To prune references as part of your normal workflow without needing to
+remember to run that, set `fetch.prune` globally, or
+`remote.<name>.prune` per-remote in the config. See
+linkgit:git-config[1].
+
+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).
+
+Therefore if the refspec for the remote includes
+e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch
+--prune <name> "refs/tags/*:refs/tags/*"` it won't be stale remote
+tracking branches that are deleted, but any local tag that doesn't
+exist on the remote.
+
+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.
+
+So be careful when using this with a refspec like
+`refs/tags/*:refs/tags/*`, or any other refspec which might map
+references from multiple remotes to the same local namespace.
+
+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].
+
+The `--prune-tags` option is equivalent to having
+`refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This
+can lead to some seemingly strange interactions:
+
+------------------------------------------------
+# These both fetch tags
+$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'
+$ git fetch --no-tags --prune-tags origin
+------------------------------------------------
+
+The reason it doesn't error out when provided without `--prune` or its
+config versions is for flexibility of the configured versions, and to
+maintain a 1=1 mapping between what the command line flags do, and
+what the configuration versions do.
+
+It's reasonable to e.g. configure `fetch.pruneTags=true` in
+`~/.gitconfig` to have tags pruned whenever `git fetch --prune` is
+run, without making every invocation of `git fetch` without `--prune`
+an error.
+
+Pruning tags with `--prune-tags` also works when fetching a URL
+instead of a named remote. These will all prune tags not found on
+origin:
+
+------------------------------------------------
+$ git fetch origin --prune --prune-tags
+$ git fetch origin --prune 'refs/tags/*:refs/tags/*'
+$ git fetch <url of origin> --prune --prune-tags
+$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*'
+------------------------------------------------
+
 OUTPUT
 ------
 
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 3a52e4d..b634043 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -222,6 +222,14 @@ this purpose, they are instead rewritten to point at the nearest ancestor that
 was not excluded.
 
 
+EXIT STATUS
+-----------
+
+On success, the exit status is `0`.  If the filter can't find any commits to
+rewrite, the exit status is `2`.  On any other error, the exit status may be
+any other non-zero value.
+
+
 Examples
 --------
 
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 571b5a7..3126e0d 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -15,8 +15,9 @@ DESCRIPTION
 -----------
 Runs a number of housekeeping tasks within the current repository,
 such as compressing file revisions (to reduce disk space and increase
-performance) and removing unreachable objects which may have been
-created from prior invocations of 'git add'.
+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.
 
 Users are encouraged to run this task on a regular basis within
 each repository to maintain good disk space utilization and good
@@ -45,20 +46,25 @@ OPTIONS
 	With this option, 'git gc' checks whether any housekeeping is
 	required; if not, it exits without performing any work.
 	Some git commands run `git gc --auto` after performing
-	operations that could create many loose objects.
+	operations that could create many loose objects. Housekeeping
+	is required if there are too many loose objects or too many
+	packs in the repository.
 +
-Housekeeping is required if there are too many loose objects or
-too many packs in the repository. If the number of loose objects
-exceeds the value of the `gc.auto` configuration variable, then
-all loose objects are combined into a single pack using
-`git repack -d -l`.  Setting the value of `gc.auto` to 0
-disables automatic packing of loose objects.
+If the number of loose objects exceeds the value of the `gc.auto`
+configuration variable, then all loose objects are combined into a
+single pack using `git repack -d -l`.  Setting the value of `gc.auto`
+to 0 disables automatic packing of loose objects.
 +
 If the number of packs exceeds the value of `gc.autoPackLimit`,
 then existing packs (except those marked with a `.keep` file)
 are consolidated into a single pack by using the `-A` option of
 'git repack'. Setting `gc.autoPackLimit` to 0 disables
 automatic consolidation of packs.
++
+If houskeeping is required due to many loose objects or packs, all
+other housekeeping tasks (e.g. rerere, working trees, reflog...) will
+be performed as well.
+
 
 --prune=<date>::
 	Prune loose objects older than date (default is 2 weeks ago,
@@ -133,6 +139,10 @@ The optional configuration variable `gc.pruneExpire` controls how old
 the unreferenced loose objects have to be before they are pruned.  The
 default is "2 weeks ago".
 
+Optional configuration variable `gc.worktreePruneExpire` controls how
+old a stale working tree should be before `git worktree prune` deletes
+it. Default is "3 months ago".
+
 
 Notes
 -----
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 1b4b65d..138edb4 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -77,6 +77,9 @@ OPTIONS
 --check-self-contained-and-connected::
 	Die if the pack contains broken links. For internal use only.
 
+--fsck-objects::
+	Die if the pack contains broken objects. For internal use only.
+
 --threads=<n>::
 	Specifies the number of threads to spawn when resolving
 	deltas. This requires that index-pack be compiled with
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 9dd19a1..ff446f1 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -51,7 +51,7 @@ with only spaces at the end of the commit message part, one blank line
 will be added before the new trailer.
 
 Existing trailers are extracted from the input message by looking for
-a group of one or more lines that (i) are all trailers, or (ii) contains at
+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.
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 8a861c1..3277ca1 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 	[<upstream> [<branch>]]
 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
 	--root [<branch>]
-'git rebase' --continue | --skip | --abort | --quit | --edit-todo
+'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
 
 DESCRIPTION
 -----------
@@ -244,12 +244,22 @@ leave out at most one of A and B, in which case it defaults to HEAD.
 	Keep the commits that do not change anything from its
 	parents in the result.
 
+--allow-empty-message::
+	By default, rebasing commits with an empty message will fail.
+	This option overrides that behavior, allowing commits with empty
+	messages to be rebased.
+
 --skip::
 	Restart the rebasing process by skipping the current patch.
 
 --edit-todo::
 	Edit the todo list during an interactive rebase.
 
+--show-current-patch::
+	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`.
+
 -m::
 --merge::
 	Use merging strategies to rebase.  When the recursive (default) merge
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 577b969..4feddc0 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -172,10 +172,14 @@ With `-n` option, the remote heads are not queried first with
 
 'prune'::
 
-Deletes all stale remote-tracking branches under <name>.
-These stale branches have already been removed from the remote repository
-referenced by <name>, but are still locally available in
-"remotes/<name>".
+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.
++
+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 will be pruned, but do not
 actually prune them.
@@ -189,7 +193,7 @@ 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]).
 +
-With `--prune` option, prune all the remotes that are updated.
+With `--prune` option, run pruning against all the remotes that are updated.
 
 
 DISCUSSION
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 8060ea3..71ef97b 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -84,6 +84,11 @@ See the CONFIGURATION section for `sendemail.multiEdit`.
 	the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not
 	set, as returned by "git var -l".
 
+--reply-to=<address>::
+	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.
+
 --in-reply-to=<identifier>::
 	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
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index ee6c547..5e35ea1 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -8,8 +8,8 @@ git-shortlog - Summarize 'git log' output
 SYNOPSIS
 --------
 [verse]
-git log --pretty=short | 'git shortlog' [<options>]
 'git shortlog' [<options>] [<revision range>] [[\--] <path>...]
+git log --pretty=short | 'git shortlog' [<options>]
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 056dfb8..7ef8c47 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
 'git stash' branch <branchname> [<stash>]
 'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
-	     [-u|--include-untracked] [-a|--all] [-m|--message <message>]]
+	     [-u|--include-untracked] [-a|--all] [-m|--message <message>]
 	     [--] [<pathspec>...]]
 'git stash' clear
 'git stash' create [<message>]
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 72bfb87..6c230c0 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -130,6 +130,11 @@ ignored, then the directory is not shown, but all contents are shown.
 	without options are equivalent to 'always' and 'never'
 	respectively.
 
+--ahead-behind::
+--no-ahead-behind::
+	Display or do not display detailed ahead/behind counts for the
+	branch relative to its upstream branch.  Defaults to true.
+
 <pathspec>...::
 	See the 'pathspec' entry in linkgit:gitglossary[7].
 
@@ -184,10 +189,10 @@ in which case `XY` are `!!`.
 
     X          Y     Meaning
     -------------------------------------------------
-              [MD]   not updated
+	     [AMD]   not updated
     M        [ MD]   updated in index
     A        [ MD]   added to index
-    D         [ M]   deleted from index
+    D                deleted from index
     R        [ MD]   renamed in index
     C        [ MD]   copied in index
     [MARC]           index and work tree matches
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 956fc01..1d17101 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -9,7 +9,7 @@ git-tag - Create, list, delete or verify a tag object signed with GPG
 SYNOPSIS
 --------
 [verse]
-'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
+'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]
 	<tagname> [<commit> | <object>]
 'git tag' -d <tagname>...
 'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
@@ -167,6 +167,12 @@ This option is only applicable when listing tags without annotation lines.
 	Implies `-a` if none of `-a`, `-s`, or `-u <keyid>`
 	is given.
 
+-e::
+--edit::
+	The message taken from file with `-F` and command line with
+	`-m` are usually used as the tag message unmodified.
+	This option lets you further edit the message taken from these sources.
+
 --cleanup=<mode>::
 	This option sets how the tag message is cleaned up.
 	The  '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'.  The
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index bdb0342..3897a59 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -464,6 +464,32 @@ command reads the index; while when `--[no-|force-]untracked-cache`
 are used, the untracked cache is immediately added to or removed from
 the index.
 
+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):
+
+----------------
+$ git -c core.untrackedCache=false status
+----------------
+
+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.
+
+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.
+
+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.
+
 File System Monitor
 -------------------
 
@@ -484,8 +510,8 @@ 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 to `true` (or `false`) in your `$HOME/.gitconfig` just once
-and have it affect all repositories you touch.
+variable in your `$HOME/.gitconfig` just once and have it affect all
+repositories you touch.
 
 When the `core.fsmonitor` configuration variable is changed, the
 file system monitor is added to or removed from the index the next time
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 41585f5..e7eb24a 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -12,7 +12,9 @@ SYNOPSIS
 'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]
 'git worktree list' [--porcelain]
 'git worktree lock' [--reason <string>] <worktree>
+'git worktree move' <worktree> <new-path>
 'git worktree prune' [-n] [-v] [--expire <expire>]
+'git worktree remove' [--force] <worktree>
 'git worktree unlock' <worktree>
 
 DESCRIPTION
@@ -34,10 +36,6 @@ The working tree's administrative files in the repository (see
 `git worktree prune` in the main or any linked working tree to
 clean up any stale administrative files.
 
-If you move a linked working tree, you need to manually update the
-administrative files so that they do not get pruned automatically. See
-section "DETAILS" for more information.
-
 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
@@ -52,10 +50,11 @@ 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}`.
 +
-If <commit-ish> is a branch name (call it `<branch>` and is not found,
+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
+with a matching name, treat as equivalent to:
++
 ------------
 $ git worktree add --track -b <branch> <path> <remote>/<branch>
 ------------
@@ -79,10 +78,22 @@ files from being pruned automatically. This also prevents it from
 being moved or deleted. Optionally, specify a reason for the lock
 with `--reason`.
 
+move::
+
+Move a working tree to a new location. Note that the main working tree
+or linked working trees containing submodules cannot be moved.
+
 prune::
 
 Prune working tree information in $GIT_DIR/worktrees.
 
+remove::
+
+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.
+
 unlock::
 
 Unlock a working tree, allowing it to be pruned, moved or deleted.
@@ -92,9 +103,10 @@ OPTIONS
 
 -f::
 --force::
-	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. This option overrides
-	that safeguard.
+	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 and `remove` refuses to remove an unclean
+	working tree. This option overrides that safeguard.
 
 -b <new-branch>::
 -B <new-branch>::
@@ -196,7 +208,7 @@ 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.
 
-If you move a linked working tree, you need to update the 'gitdir' file
+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
@@ -276,13 +288,6 @@ 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.
 
-git-worktree could provide more automation for tasks currently
-performed manually, such as:
-
-- `remove` to remove a linked working tree and its administrative files (and
-  warn if the working tree is dirty)
-- `mv` to move or rename a working tree and update its administrative files
-
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8163b57..4767860 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -849,6 +849,9 @@ 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.
 
+Issues which are security relevant should be disclosed privately to
+the Git Security mailing list <git-security@googlegroups.com>.
+
 SEE ALSO
 --------
 linkgit:gittutorial[7], linkgit:gittutorial-2[7],
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index c21f5ca..1094fe2 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -56,9 +56,16 @@ Unspecified::
 
 When more than one pattern matches the path, a later line
 overrides an earlier line.  This overriding is done per
-attribute.  The rules how the pattern matches paths are the
-same as in `.gitignore` files; see linkgit:gitignore[5].
-Unlike `.gitignore`, negative patterns are forbidden.
+attribute.
+
+The rules by which the pattern matches paths are the same as in
+`.gitignore` files (see linkgit:gitignore[5]), with a few exceptions:
+
+  - negative patterns are forbidden
+
+  - patterns that match a directory do not recursively match paths
+    inside that directory (so using the trailing-slash `path/` syntax is
+    pointless in an attributes file; use `path/**` instead)
 
 When deciding what attributes are assigned to a path, Git
 consults `$GIT_DIR/info/attributes` file (which has the highest
@@ -714,6 +721,8 @@ patterns are available:
 
 - `fountain` suitable for Fountain documents.
 
+- `golang` suitable for source code in the Go language.
+
 - `html` suitable for HTML/XHTML documents.
 
 - `java` suitable for source code in the Java language.
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 63260f0..ff5d7f9 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -102,12 +102,11 @@ PATTERN FORMAT
    (relative to the toplevel of the work tree if not from a
    `.gitignore` file).
 
- - Otherwise, Git treats the pattern as a shell glob suitable
-   for consumption by fnmatch(3) with the FNM_PATHNAME flag:
-   wildcards in the pattern will not match a / in the pathname.
-   For example, "Documentation/{asterisk}.html" matches
-   "Documentation/git.html" but not "Documentation/ppc/ppc.html"
-   or "tools/perf/Documentation/perf.html".
+ - Otherwise, Git treats the pattern as a shell glob: "`*`" matches
+   anything except "`/`", "`?`" matches any one character except "`/`"
+   and "`[]`" matches one character in a selected range. See
+   fnmatch(3) and the FNM_PATHNAME flag for a more detailed
+   description.
 
  - A leading slash matches the beginning of the pathname.
    For example, "/{asterisk}.c" matches "cat-file.c" but not
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index c60bcad..e85148f 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -275,11 +275,6 @@ worktrees/<id>/locked::
 	or manually by `git worktree prune`. The file may contain a string
 	explaining why the repository is locked.
 
-worktrees/<id>/link::
-	If this file exists, it is a hard link to the linked .git
-	file. It is used to detect if the linked repository is
-	manually removed.
-
 SEE ALSO
 --------
 linkgit:git-init[1],
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 4d6c177..3b9faab 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -24,7 +24,7 @@ On the filesystem, a submodule usually (but not always - see FORMS below)
 consists of (i) a Git directory located under the `$GIT_DIR/modules/`
 directory of its superproject, (ii) a working directory inside the
 superproject's working directory, and a `.git` file at the root of
-the submodule’s working directory pointing to (i).
+the submodule's working directory pointing to (i).
 
 Assuming the submodule has a Git directory at `$GIT_DIR/modules/foo/`
 and a working directory at `path/to/bar/`, the superproject tracks the
@@ -33,7 +33,7 @@ in its `.gitmodules` file (see linkgit:gitmodules[5]) of the form
 `submodule.foo.path = path/to/bar`.
 
 The `gitlink` entry contains the object name of the commit that the
-superproject expects the submodule’s working directory to be at.
+superproject expects the submodule's working directory to be at.
 
 The section `submodule.foo.*` in the `.gitmodules` file gives additional
 hints to Git's porcelain layer. For example, the `submodule.foo.url`
@@ -136,27 +136,27 @@ using older versions of Git.
 +
 It is possible to construct these old form repositories manually.
 +
-When deinitialized or deleted (see below), the submodule’s Git
+When deinitialized or deleted (see below), the submodule's Git
 directory is automatically moved to `$GIT_DIR/modules/<name>/`
 of the superproject.
 
  * Deinitialized submodule: A `gitlink`, and a `.gitmodules` entry,
-but no submodule working directory. The submodule’s Git directory
+but no submodule working directory. The submodule's Git directory
 may be there as after deinitializing the Git directory is kept around.
 The directory which is supposed to be the working directory is empty instead.
 +
 A submodule can be deinitialized by running `git submodule deinit`.
 Besides emptying the working directory, this command only modifies
-the superproject’s `$GIT_DIR/config` file, so the superproject’s history
+the superproject's `$GIT_DIR/config` file, so the superproject's history
 is not affected. This can be undone using `git submodule init`.
 
  * Deleted submodule: A submodule can be deleted by running
 `git rm <submodule path> && git commit`. This can be undone
 using `git revert`.
 +
-The deletion removes the superproject’s tracking data, which are
+The deletion removes the superproject's tracking data, which are
 both the `gitlink` entry and the section in the `.gitmodules` file.
-The submodule’s working directory is removed from the file
+The submodule's working directory is removed from the file
 system, but the Git directory is kept around as it to make it
 possible to checkout past commits without requiring fetching
 from another repository.
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 3888c3f..63a3fc0 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -35,7 +35,8 @@ set to `no` at the beginning of them.
 --no-ff::
 	Create a merge commit even when the merge resolves as a
 	fast-forward.  This is the default behaviour when merging an
-	annotated (and possibly signed) tag.
+	annotated (and possibly signed) tag that is not stored in
+	its natural place in 'refs/tags/' hierarchy.
 
 --ff-only::
 	Refuse to merge and exit with a non-zero status unless the
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index fd5d748..4a58aad 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
 
 theirs;;
 	This is the opposite of 'ours'; note that, unlike 'ours', there is
-	no 'theirs' merge stragegy to confuse this merge option with.
+	no 'theirs' merge strategy to confuse this merge option with.
 
 patience;;
 	With this option, 'merge-recursive' spends a little extra time
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index e664c08..6109ef0 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -202,7 +202,7 @@ endif::git-rev-list[]
 - '%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)'
   respectively, except that if the next placeholder takes more spaces
   than given and there are spaces on its left, use those spaces
-- '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
+- '%><(<N>)', '%><|(<N>)': similar to '%<(<N>)', '%<|(<N>)'
   respectively, but padding both sides (i.e. the text is centered)
 - %(trailers[:options]): display the trailers of the body as interpreted
   by linkgit:git-interpret-trailers[1]. The `trailers` string may be
diff --git a/Documentation/technical/api-object-access.txt b/Documentation/technical/api-object-access.txt
index 03bb0e9..a1162e5 100644
--- a/Documentation/technical/api-object-access.txt
+++ b/Documentation/technical/api-object-access.txt
@@ -7,7 +7,7 @@ Talk about <sha1_file.c> and <object.h> family, things like
 * read_object_with_reference()
 * has_sha1_file()
 * write_sha1_file()
-* pretend_sha1_file()
+* pretend_object_file()
 * lookup_{object,commit,tag,blob,tree}
 * parse_{object,commit,tag,blob,tree}
 * Use of object flags
diff --git a/Documentation/technical/api-submodule-config.txt b/Documentation/technical/api-submodule-config.txt
index 3dce003..ee907c4 100644
--- a/Documentation/technical/api-submodule-config.txt
+++ b/Documentation/technical/api-submodule-config.txt
@@ -4,7 +4,7 @@ submodule config cache API
 The submodule config cache API allows to read submodule
 configurations/information from specified revisions. Internally
 information is lazily read into a cache that is used to avoid
-unnecessary parsing of the same .gitmodule files. Lookups can be done by
+unnecessary parsing of the same .gitmodules files. Lookups can be done by
 submodule path or name.
 
 Usage
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
index 417ba49..4ab6cd1 100644
--- a/Documentation/technical/hash-function-transition.txt
+++ b/Documentation/technical/hash-function-transition.txt
@@ -28,11 +28,30 @@ advantages:
   address stored content.
 
 Over time some flaws in SHA-1 have been discovered by security
-researchers. https://shattered.io demonstrated a practical SHA-1 hash
-collision. As a result, SHA-1 cannot be considered cryptographically
-secure any more. This impacts the communication of hash values because
-we cannot trust that a given hash value represents the known good
-version of content that the speaker intended.
+researchers. On 23 February 2017 the SHAttered attack
+(https://shattered.io) demonstrated a practical SHA-1 hash collision.
+
+Git v2.13.0 and later subsequently moved to a hardened SHA-1
+implementation by default, which isn't vulnerable to the SHAttered
+attack.
+
+Thus Git has in effect already migrated to a new hash that isn't SHA-1
+and doesn't share its vulnerabilities, its new hash function just
+happens to produce exactly the same output for all known inputs,
+except two PDFs published by the SHAttered researchers, and the new
+implementation (written by those researchers) claims to detect future
+cryptanalytic collision attacks.
+
+Regardless, it's considered prudent to move past any variant of SHA-1
+to a new hash. There's no guarantee that future attacks on SHA-1 won't
+be published in the future, and those attacks may not have viable
+mitigations.
+
+If SHA-1 and its variants were to be truly broken, Git's hash function
+could not be considered cryptographically secure any more. This would
+impact the communication of hash values because we could not trust
+that a given hash value represented the known good version of content
+that the speaker intended.
 
 SHA-1 still possesses the other properties such as fast object lookup
 and safe error checking, but other hash functions are equally suitable
@@ -116,10 +135,15 @@ Documentation/technical/repository-version.txt) with extensions
 		objectFormat = newhash
 		compatObjectFormat = sha1
 
-Specifying a repository format extension ensures that versions of Git
-not aware of NewHash do not try to operate on these repositories,
-instead producing an error message:
+The combination of setting `core.repositoryFormatVersion=1` and
+populating `extensions.*` ensures that all versions of Git later than
+`v0.99.9l` will die instead of trying to operate on the NewHash
+repository, instead producing an error message.
 
+	# Between v0.99.9l and v2.7.0
+	$ git status
+	fatal: Expected git repo version <= 0, found 1
+	# After v2.7.0
 	$ git status
 	fatal: unknown repository extensions found:
 		objectformat
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index a0e45f2..64f49d0 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -214,10 +214,12 @@ smart server reply:
    S: Cache-Control: no-cache
    S:
    S: 001e# service=git-upload-pack\n
+   S: 0000
    S: 004895dcfa3633004da0049d3d0fa03f80589cbcaf31 refs/heads/maint\0multi_ack\n
    S: 0042d049f6c27a2244e12041955e262a404c7faba355 refs/heads/master\n
    S: 003c2cb58b79488a98d2721cea644875a8dd0026b115 refs/tags/v1.0\n
    S: 003fa3c2e2402b99163d1d59756e5f207ae21cccba4c refs/tags/v1.0^{}\n
+   S: 0000
 
 The client may send Extra Parameters (see
 Documentation/technical/pack-protocol.txt) as a colon-separated string
@@ -277,6 +279,7 @@ The returned response contains "version 1" if "version=1" was sent as an
 Extra Parameter.
 
   smart_reply     =  PKT-LINE("# service=$servicename" LF)
+		     "0000"
 		     *1("version 1")
 		     ref_list
 		     "0000"
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0c86f1c..12ff59c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.16.GIT
+DEF_VER=v2.17.GIT
 
 LF='
 '
diff --git a/INSTALL b/INSTALL
index 808e07b..c39006e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -88,9 +88,9 @@ Issues of note:
 	export GIT_EXEC_PATH PATH GITPERLLIB
 
  - By default (unless NO_PERL is provided) Git will ship various perl
-   scripts & libraries it needs. However, for simplicity it doesn't
-   use the ExtUtils::MakeMaker toolchain to decide where to place the
-   perl libraries. Depending on the system this can result in the perl
+   scripts. However, for simplicity it doesn't use the
+   ExtUtils::MakeMaker toolchain to decide where to place the perl
+   libraries. Depending on the system this can result in the perl
    libraries not being where you'd like them if they're expected to be
    used by things other than Git itself.
 
@@ -102,6 +102,11 @@ Issues of note:
    Will result in e.g. perllibdir=/usr/share/perl/5.26.1 on Debian,
    perllibdir=/usr/share/perl5 (which we'd use by default) on CentOS.
 
+ - Unless NO_PERL is provided Git will ship various perl libraries it
+   needs. Distributors of Git will usually want to set
+   NO_PERL_CPAN_FALLBACKS if NO_PERL is not provided to use their own
+   copies of the CPAN modules Git needs.
+
  - Git is reasonably self-sufficient, but does depend on a few external
    programs and libraries.  Git can be used without most of them by adding
    the approriate "NO_<LIBRARY>=YesPlease" to the make command line or
@@ -121,7 +126,8 @@ Issues of note:
 	  Redhat/Fedora are reported to ship Perl binary package with some
 	  core modules stripped away (see http://lwn.net/Articles/477234/),
 	  so you might need to install additional packages other than Perl
-	  itself, e.g. Time::HiRes.
+	  itself, e.g. Digest::MD5, File::Spec, File::Temp, Net::Domain,
+	  Net::SMTP, and Time::HiRes.
 
 	- git-imap-send needs the OpenSSL library to talk IMAP over SSL if
 	  you are using libcurl older than 7.34.0.  Otherwise you can use
diff --git a/Makefile b/Makefile
index 5bcd83d..96f6138 100644
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,10 @@ all::
 # Perl-compatible regular expressions instead of standard or extended
 # POSIX regular expressions.
 #
-# Currently USE_LIBPCRE is a synonym for USE_LIBPCRE1, define
-# USE_LIBPCRE2 instead if you'd like to use version 2 of the PCRE
-# library. The USE_LIBPCRE flag will likely be changed to mean v2 by
-# default in future releases.
+# USE_LIBPCRE is a synonym for USE_LIBPCRE2, define USE_LIBPCRE1
+# instead if you'd like to use the legacy version 1 of the PCRE
+# library. Support for version 1 will likely be removed in some future
+# release of Git, as upstream has all but abandoned it.
 #
 # When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if the PCRE v1
 # library is compiled without --enable-jit. We will auto-detect
@@ -296,6 +296,12 @@ all::
 #
 # Define NO_PERL if you do not want Perl scripts or libraries at all.
 #
+# Define NO_PERL_CPAN_FALLBACKS if you do not want to install bundled
+# copies of CPAN modules that serve as a fallback in case the modules
+# are not available on the system. This option is intended for
+# distributions that want to use their packaged versions of Perl
+# modules, instead of the fallbacks shipped with Git.
+#
 # Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
 # but /usr/bin/python2.7 on some platforms).
 #
@@ -329,6 +335,13 @@ all::
 # when hardlinking a file to another name and unlinking the original file right
 # away (some NTFS drivers seem to zero the contents in that scenario).
 #
+# Define INSTALL_SYMLINKS if you prefer to have everything that can be
+# symlinked between bin/ and libexec/ to use relative symlinks between
+# the two. This option overrides NO_CROSS_DIRECTORY_HARDLINKS and
+# NO_INSTALL_HARDLINKS which will also use symlinking by indirection
+# within the same directory in some cases, INSTALL_SYMLINKS will
+# always symlink to the final target directly.
+#
 # Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed
 # programs as a tar, where bin/ and libexec/ might be on different file systems.
 #
@@ -468,8 +481,7 @@ ARFLAGS = rcs
 # This can help installing the suite in a relocatable way.
 
 prefix = $(HOME)
-bindir_relative = bin
-bindir = $(prefix)/$(bindir_relative)
+bindir = $(prefix)/bin
 mandir = $(prefix)/share/man
 infodir = $(prefix)/share/info
 gitexecdir = libexec/git-core
@@ -486,8 +498,10 @@ lib = lib
 # DESTDIR =
 pathsep = :
 
+bindir_relative = $(patsubst $(prefix)/%,%,$(bindir))
 mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
 infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
+gitexecdir_relative = $(patsubst $(prefix)/%,%,$(gitexecdir))
 htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
 
 export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
@@ -1164,13 +1178,18 @@ ifdef NO_LIBGEN_H
 	COMPAT_OBJS += compat/basename.o
 endif
 
-USE_LIBPCRE1 ?= $(USE_LIBPCRE)
+USE_LIBPCRE2 ?= $(USE_LIBPCRE)
 
-ifneq (,$(USE_LIBPCRE1))
-	ifdef USE_LIBPCRE2
-$(error Only set USE_LIBPCRE1 (or its alias USE_LIBPCRE) or USE_LIBPCRE2, not both!)
+ifneq (,$(USE_LIBPCRE2))
+	ifdef USE_LIBPCRE1
+$(error Only set USE_LIBPCRE2 (or its alias USE_LIBPCRE) or USE_LIBPCRE1, not both!)
 	endif
 
+	BASIC_CFLAGS += -DUSE_LIBPCRE2
+	EXTLIBS += -lpcre2-8
+endif
+
+ifdef USE_LIBPCRE1
 	BASIC_CFLAGS += -DUSE_LIBPCRE1
 	EXTLIBS += -lpcre
 
@@ -1179,11 +1198,6 @@ ifdef NO_LIBPCRE1_JIT
 endif
 endif
 
-ifdef USE_LIBPCRE2
-	BASIC_CFLAGS += -DUSE_LIBPCRE2
-	EXTLIBS += -lpcre2-8
-endif
-
 ifdef LIBPCREDIR
 	BASIC_CFLAGS += -I$(LIBPCREDIR)/include
 	EXTLIBS += -L$(LIBPCREDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBPCREDIR)/$(lib)
@@ -1513,7 +1527,9 @@ else
 	LIB_OBJS += sha1dc_git.o
 ifdef DC_SHA1_EXTERNAL
 	ifdef DC_SHA1_SUBMODULE
+		ifneq ($(DC_SHA1_SUBMODULE),auto)
 $(error Only set DC_SHA1_EXTERNAL or DC_SHA1_SUBMODULE, not both)
+		endif
 	endif
 	BASIC_CFLAGS += -DDC_SHA1_EXTERNAL
 	EXTLIBS += -lsha1detectcoll
@@ -1733,6 +1749,7 @@ infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
 perllibdir_SQ = $(subst ','\'',$(perllibdir))
 localedir_SQ = $(subst ','\'',$(localedir))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
+gitexecdir_relative_SQ = $(subst ','\'',$(gitexecdir_relative))
 template_dir_SQ = $(subst ','\'',$(template_dir))
 htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
 prefix_SQ = $(subst ','\'',$(prefix))
@@ -2160,6 +2177,8 @@ gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
 http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
 	-DCURL_DISABLE_TYPECHECK
 
+pack-revindex.sp: SPARSE_FLAGS += -Wno-memcpy-max-count
+
 ifdef NO_EXPAT
 http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
 endif
@@ -2214,13 +2233,15 @@ $(VCSSVN_LIB): $(VCSSVN_OBJS)
 
 export DEFAULT_EDITOR DEFAULT_PAGER
 
-.PHONY: doc man html info pdf
-doc:
+.PHONY: doc man man-perl html info pdf
+doc: man-perl
 	$(MAKE) -C Documentation all
 
-man:
+man: man-perl
 	$(MAKE) -C Documentation man
 
+man-perl: perl/build/man/man3/Git.3pm
+
 html:
 	$(MAKE) -C Documentation html
 
@@ -2298,14 +2319,22 @@ po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
 
 LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm)
 LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL))
+LIB_CPAN := $(wildcard perl/FromCPAN/*.pm perl/FromCPAN/*/*.pm)
+LIB_CPAN_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_CPAN))
 
 ifndef NO_PERL
 all:: $(LIB_PERL_GEN)
+ifndef NO_PERL_CPAN_FALLBACKS
+all:: $(LIB_CPAN_GEN)
+endif
+NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS))
 endif
 
 perl/build/lib/%.pm: perl/%.pm
 	$(QUIET_GEN)mkdir -p $(dir $@) && \
-	sed -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' < $< > $@
+	sed -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
+	    -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
+	< $< > $@
 
 perl/build/man/man3/Git.3pm: perl/Git.pm
 	$(QUIET_GEN)mkdir -p $(dir $@) && \
@@ -2586,39 +2615,48 @@ endif
 
 	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
+	destdir_from_execdir_SQ=$$(echo '$(gitexecdir_relative_SQ)' | sed -e 's|[^/][^/]*|..|g') && \
 	{ test "$$bindir/" = "$$execdir/" || \
 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
 		$(RM) "$$execdir/$$p" && \
-		test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
-		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
-		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
+		test -n "$(INSTALL_SYMLINKS)" && \
+		ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/$$p" "$$execdir/$$p" || \
+		{ test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+		  ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+		  cp "$$bindir/$$p" "$$execdir/$$p" || exit; } \
 	  done; \
 	} && \
 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
 		$(RM) "$$bindir/$$p" && \
-		test -z "$(NO_INSTALL_HARDLINKS)" && \
-		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
-		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
-		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
+		test -n "$(INSTALL_SYMLINKS)" && \
+		ln -s "git$X" "$$bindir/$$p" || \
+		{ test -z "$(NO_INSTALL_HARDLINKS)" && \
+		  ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
+		  ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
+		  cp "$$bindir/git$X" "$$bindir/$$p" || exit; } \
 	done && \
 	for p in $(BUILT_INS); do \
 		$(RM) "$$execdir/$$p" && \
-		test -z "$(NO_INSTALL_HARDLINKS)" && \
-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
-		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
-		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
+		test -n "$(INSTALL_SYMLINKS)" && \
+		ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \
+		{ test -z "$(NO_INSTALL_HARDLINKS)" && \
+		  ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+		  ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+		  cp "$$execdir/git$X" "$$execdir/$$p" || exit; } \
 	done && \
 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
 	for p in $$remote_curl_aliases; do \
 		$(RM) "$$execdir/$$p" && \
-		test -z "$(NO_INSTALL_HARDLINKS)" && \
-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
-		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
-		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+		test -n "$(INSTALL_SYMLINKS)" && \
+		ln -s "git-remote-http$X" "$$execdir/$$p" || \
+		{ test -z "$(NO_INSTALL_HARDLINKS)" && \
+		  ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+		  ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+		  cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; } \
 	done && \
 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
 
-.PHONY: install-gitweb install-doc install-man install-html install-info install-pdf
+.PHONY: install-gitweb install-doc install-man install-man-perl install-html install-info install-pdf
 .PHONY: quick-install-doc quick-install-man quick-install-html
 install-gitweb:
 	$(MAKE) -C gitweb install
@@ -2629,7 +2667,7 @@ install-doc: install-man-perl
 install-man: install-man-perl
 	$(MAKE) -C Documentation install-man
 
-install-man-perl: perl/build/man/man3/Git.3pm
+install-man-perl: man-perl
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
 	(cd perl/build/man/man3 && $(TAR) cf - .) | \
 	(cd '$(DESTDIR_SQ)$(mandir_SQ)/man3' && umask 022 && $(TAR) xof -)
@@ -2668,6 +2706,21 @@ dist: git-archive$(X) configure
 		$(GIT_TARNAME)/configure \
 		$(GIT_TARNAME)/version \
 		$(GIT_TARNAME)/git-gui/version
+ifdef DC_SHA1_SUBMODULE
+	@mkdir -p $(GIT_TARNAME)/sha1collisiondetection/lib
+	@cp sha1collisiondetection/LICENSE.txt \
+		$(GIT_TARNAME)/sha1collisiondetection/
+	@cp sha1collisiondetection/LICENSE.txt \
+		$(GIT_TARNAME)/sha1collisiondetection/
+	@cp sha1collisiondetection/lib/sha1.[ch] \
+		$(GIT_TARNAME)/sha1collisiondetection/lib/
+	@cp sha1collisiondetection/lib/ubc_check.[ch] \
+		$(GIT_TARNAME)/sha1collisiondetection/lib/
+	$(TAR) rf $(GIT_TARNAME).tar \
+		$(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \
+		$(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \
+		$(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch]
+endif
 	@$(RM) -r $(GIT_TARNAME)
 	gzip -f -9 $(GIT_TARNAME).tar
 
@@ -2717,7 +2770,7 @@ clean: profile-clean coverage-clean
 	$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
 	$(RM) -r bin-wrappers $(dep_dirs)
 	$(RM) -r po/build/
-	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
+	$(RM) *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
 	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
 	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
 	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
diff --git a/RelNotes b/RelNotes
index 7a6dc06..f6c58b3 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.17.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.18.0.txt
\ No newline at end of file
diff --git a/apply.c b/apply.c
index f8b67bf..7e5792c 100644
--- a/apply.c
+++ b/apply.c
@@ -950,7 +950,7 @@ static int gitdiff_verify_name(struct apply_state *state,
 		}
 		free(another);
 	} else {
-		if (!starts_with(line, "/dev/null\n"))
+		if (!is_dev_null(line))
 			return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
 	}
 
@@ -2301,7 +2301,7 @@ static void update_pre_post_images(struct image *preimage,
 				   size_t len, size_t postlen)
 {
 	int i, ctx, reduced;
-	char *new, *old, *fixed;
+	char *new_buf, *old_buf, *fixed;
 	struct image fixed_preimage;
 
 	/*
@@ -2327,25 +2327,25 @@ static void update_pre_post_images(struct image *preimage,
 	 * We trust the caller to tell us if the update can be done
 	 * in place (postlen==0) or not.
 	 */
-	old = postimage->buf;
+	old_buf = postimage->buf;
 	if (postlen)
-		new = postimage->buf = xmalloc(postlen);
+		new_buf = postimage->buf = xmalloc(postlen);
 	else
-		new = old;
+		new_buf = old_buf;
 	fixed = preimage->buf;
 
 	for (i = reduced = ctx = 0; i < postimage->nr; i++) {
 		size_t l_len = postimage->line[i].len;
 		if (!(postimage->line[i].flag & LINE_COMMON)) {
 			/* an added line -- no counterparts in preimage */
-			memmove(new, old, l_len);
-			old += l_len;
-			new += l_len;
+			memmove(new_buf, old_buf, l_len);
+			old_buf += l_len;
+			new_buf += l_len;
 			continue;
 		}
 
 		/* a common context -- skip it in the original postimage */
-		old += l_len;
+		old_buf += l_len;
 
 		/* and find the corresponding one in the fixed preimage */
 		while (ctx < preimage->nr &&
@@ -2365,29 +2365,29 @@ static void update_pre_post_images(struct image *preimage,
 
 		/* and copy it in, while fixing the line length */
 		l_len = preimage->line[ctx].len;
-		memcpy(new, fixed, l_len);
-		new += l_len;
+		memcpy(new_buf, fixed, l_len);
+		new_buf += l_len;
 		fixed += l_len;
 		postimage->line[i].len = l_len;
 		ctx++;
 	}
 
 	if (postlen
-	    ? postlen < new - postimage->buf
-	    : postimage->len < new - postimage->buf)
+	    ? postlen < new_buf - postimage->buf
+	    : postimage->len < new_buf - postimage->buf)
 		die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",
-		    (int)postlen, (int) postimage->len, (int)(new - postimage->buf));
+		    (int)postlen, (int) postimage->len, (int)(new_buf - postimage->buf));
 
 	/* Fix the length of the whole thing */
-	postimage->len = new - postimage->buf;
+	postimage->len = new_buf - postimage->buf;
 	postimage->nr -= reduced;
 }
 
 static int line_by_line_fuzzy_match(struct image *img,
 				    struct image *preimage,
 				    struct image *postimage,
-				    unsigned long try,
-				    int try_lno,
+				    unsigned long current,
+				    int current_lno,
 				    int preimage_limit)
 {
 	int i;
@@ -2404,9 +2404,9 @@ static int line_by_line_fuzzy_match(struct image *img,
 
 	for (i = 0; i < preimage_limit; i++) {
 		size_t prelen = preimage->line[i].len;
-		size_t imglen = img->line[try_lno+i].len;
+		size_t imglen = img->line[current_lno+i].len;
 
-		if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
+		if (!fuzzy_matchlines(img->buf + current + imgoff, imglen,
 				      preimage->buf + preoff, prelen))
 			return 0;
 		if (preimage->line[i].flag & LINE_COMMON)
@@ -2443,7 +2443,7 @@ static int line_by_line_fuzzy_match(struct image *img,
 	 */
 	extra_chars = preimage_end - preimage_eof;
 	strbuf_init(&fixed, imgoff + extra_chars);
-	strbuf_add(&fixed, img->buf + try, imgoff);
+	strbuf_add(&fixed, img->buf + current, imgoff);
 	strbuf_add(&fixed, preimage_eof, extra_chars);
 	fixed_buf = strbuf_detach(&fixed, &fixed_len);
 	update_pre_post_images(preimage, postimage,
@@ -2455,8 +2455,8 @@ static int match_fragment(struct apply_state *state,
 			  struct image *img,
 			  struct image *preimage,
 			  struct image *postimage,
-			  unsigned long try,
-			  int try_lno,
+			  unsigned long current,
+			  int current_lno,
 			  unsigned ws_rule,
 			  int match_beginning, int match_end)
 {
@@ -2466,12 +2466,12 @@ static int match_fragment(struct apply_state *state,
 	size_t fixed_len, postlen;
 	int preimage_limit;
 
-	if (preimage->nr + try_lno <= img->nr) {
+	if (preimage->nr + current_lno <= img->nr) {
 		/*
 		 * The hunk falls within the boundaries of img.
 		 */
 		preimage_limit = preimage->nr;
-		if (match_end && (preimage->nr + try_lno != img->nr))
+		if (match_end && (preimage->nr + current_lno != img->nr))
 			return 0;
 	} else if (state->ws_error_action == correct_ws_error &&
 		   (ws_rule & WS_BLANK_AT_EOF)) {
@@ -2482,7 +2482,7 @@ static int match_fragment(struct apply_state *state,
 		 * match with img, and the remainder of the preimage
 		 * must be blank.
 		 */
-		preimage_limit = img->nr - try_lno;
+		preimage_limit = img->nr - current_lno;
 	} else {
 		/*
 		 * The hunk extends beyond the end of the img and
@@ -2492,27 +2492,27 @@ static int match_fragment(struct apply_state *state,
 		return 0;
 	}
 
-	if (match_beginning && try_lno)
+	if (match_beginning && current_lno)
 		return 0;
 
 	/* Quick hash check */
 	for (i = 0; i < preimage_limit; i++)
-		if ((img->line[try_lno + i].flag & LINE_PATCHED) ||
-		    (preimage->line[i].hash != img->line[try_lno + i].hash))
+		if ((img->line[current_lno + i].flag & LINE_PATCHED) ||
+		    (preimage->line[i].hash != img->line[current_lno + i].hash))
 			return 0;
 
 	if (preimage_limit == preimage->nr) {
 		/*
 		 * Do we have an exact match?  If we were told to match
-		 * at the end, size must be exactly at try+fragsize,
-		 * otherwise try+fragsize must be still within the preimage,
+		 * at the end, size must be exactly at current+fragsize,
+		 * otherwise current+fragsize must be still within the preimage,
 		 * and either case, the old piece should match the preimage
 		 * exactly.
 		 */
 		if ((match_end
-		     ? (try + preimage->len == img->len)
-		     : (try + preimage->len <= img->len)) &&
-		    !memcmp(img->buf + try, preimage->buf, preimage->len))
+		     ? (current + preimage->len == img->len)
+		     : (current + preimage->len <= img->len)) &&
+		    !memcmp(img->buf + current, preimage->buf, preimage->len))
 			return 1;
 	} else {
 		/*
@@ -2543,7 +2543,7 @@ static int match_fragment(struct apply_state *state,
 	 */
 	if (state->ws_ignore_action == ignore_ws_change)
 		return line_by_line_fuzzy_match(img, preimage, postimage,
-						try, try_lno, preimage_limit);
+						current, current_lno, preimage_limit);
 
 	if (state->ws_error_action != correct_ws_error)
 		return 0;
@@ -2577,10 +2577,10 @@ static int match_fragment(struct apply_state *state,
 	 */
 	strbuf_init(&fixed, preimage->len + 1);
 	orig = preimage->buf;
-	target = img->buf + try;
+	target = img->buf + current;
 	for (i = 0; i < preimage_limit; i++) {
 		size_t oldlen = preimage->line[i].len;
-		size_t tgtlen = img->line[try_lno + i].len;
+		size_t tgtlen = img->line[current_lno + i].len;
 		size_t fixstart = fixed.len;
 		struct strbuf tgtfix;
 		int match;
@@ -2666,8 +2666,8 @@ static int find_pos(struct apply_state *state,
 		    int match_beginning, int match_end)
 {
 	int i;
-	unsigned long backwards, forwards, try;
-	int backwards_lno, forwards_lno, try_lno;
+	unsigned long backwards, forwards, current;
+	int backwards_lno, forwards_lno, current_lno;
 
 	/*
 	 * If match_beginning or match_end is specified, there is no
@@ -2687,25 +2687,25 @@ static int find_pos(struct apply_state *state,
 	if ((size_t) line > img->nr)
 		line = img->nr;
 
-	try = 0;
+	current = 0;
 	for (i = 0; i < line; i++)
-		try += img->line[i].len;
+		current += img->line[i].len;
 
 	/*
 	 * There's probably some smart way to do this, but I'll leave
 	 * that to the smart and beautiful people. I'm simple and stupid.
 	 */
-	backwards = try;
+	backwards = current;
 	backwards_lno = line;
-	forwards = try;
+	forwards = current;
 	forwards_lno = line;
-	try_lno = line;
+	current_lno = line;
 
 	for (i = 0; ; i++) {
 		if (match_fragment(state, img, preimage, postimage,
-				   try, try_lno, ws_rule,
+				   current, current_lno, ws_rule,
 				   match_beginning, match_end))
-			return try_lno;
+			return current_lno;
 
 	again:
 		if (backwards_lno == 0 && forwards_lno == img->nr)
@@ -2718,8 +2718,8 @@ static int find_pos(struct apply_state *state,
 			}
 			backwards_lno--;
 			backwards -= img->line[backwards_lno].len;
-			try = backwards;
-			try_lno = backwards_lno;
+			current = backwards;
+			current_lno = backwards_lno;
 		} else {
 			if (forwards_lno == img->nr) {
 				i++;
@@ -2727,8 +2727,8 @@ static int find_pos(struct apply_state *state,
 			}
 			forwards += img->line[forwards_lno].len;
 			forwards_lno++;
-			try = forwards;
-			try_lno = forwards_lno;
+			current = forwards;
+			current_lno = forwards_lno;
 		}
 
 	}
@@ -3154,7 +3154,7 @@ static int apply_binary(struct apply_state *state,
 		 * See if the old one matches what the patch
 		 * applies to.
 		 */
-		hash_sha1_file(img->buf, img->len, blob_type, oid.hash);
+		hash_object_file(img->buf, img->len, blob_type, &oid);
 		if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))
 			return error(_("the patch applies to '%s' (%s), "
 				       "which does not match the "
@@ -3180,7 +3180,7 @@ static int apply_binary(struct apply_state *state,
 		unsigned long size;
 		char *result;
 
-		result = read_sha1_file(oid.hash, &type, &size);
+		result = read_object_file(&oid, &type, &size);
 		if (!result)
 			return error(_("the necessary postimage %s for "
 				       "'%s' cannot be read"),
@@ -3199,7 +3199,7 @@ static int apply_binary(struct apply_state *state,
 				     name);
 
 		/* verify that the result matches */
-		hash_sha1_file(img->buf, img->len, blob_type, oid.hash);
+		hash_object_file(img->buf, img->len, blob_type, &oid);
 		if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))
 			return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
 				name, patch->new_sha1_prefix, oid_to_hex(&oid));
@@ -3242,7 +3242,7 @@ static int read_blob_object(struct strbuf *buf, const struct object_id *oid, uns
 		unsigned long sz;
 		char *result;
 
-		result = read_sha1_file(oid->hash, &type, &sz);
+		result = read_object_file(oid, &type, &sz);
 		if (!result)
 			return -1;
 		/* XXX read_sha1_file NUL-terminates */
@@ -3554,7 +3554,7 @@ static int try_threeway(struct apply_state *state,
 
 	/* Preimage the patch was prepared for */
 	if (patch->is_new)
-		write_sha1_file("", 0, blob_type, pre_oid.hash);
+		write_object_file("", 0, blob_type, &pre_oid);
 	else if (get_oid(patch->old_sha1_prefix, &pre_oid) ||
 		 read_blob_object(&buf, &pre_oid, patch->old_mode))
 		return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
@@ -3570,7 +3570,7 @@ static int try_threeway(struct apply_state *state,
 		return -1;
 	}
 	/* post_oid is theirs */
-	write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_oid.hash);
+	write_object_file(tmp_image.buf, tmp_image.len, blob_type, &post_oid);
 	clear_image(&tmp_image);
 
 	/* our_oid is ours */
@@ -3583,7 +3583,7 @@ static int try_threeway(struct apply_state *state,
 			return error(_("cannot read the current contents of '%s'"),
 				     patch->old_name);
 	}
-	write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_oid.hash);
+	write_object_file(tmp_image.buf, tmp_image.len, blob_type, &our_oid);
 	clear_image(&tmp_image);
 
 	/* in-core three-way merge between post and our using pre as base */
@@ -4163,30 +4163,30 @@ static void show_mode_change(struct patch *p, int show_name)
 static void show_rename_copy(struct patch *p)
 {
 	const char *renamecopy = p->is_rename ? "rename" : "copy";
-	const char *old, *new;
+	const char *old_name, *new_name;
 
 	/* Find common prefix */
-	old = p->old_name;
-	new = p->new_name;
+	old_name = p->old_name;
+	new_name = p->new_name;
 	while (1) {
 		const char *slash_old, *slash_new;
-		slash_old = strchr(old, '/');
-		slash_new = strchr(new, '/');
+		slash_old = strchr(old_name, '/');
+		slash_new = strchr(new_name, '/');
 		if (!slash_old ||
 		    !slash_new ||
-		    slash_old - old != slash_new - new ||
-		    memcmp(old, new, slash_new - new))
+		    slash_old - old_name != slash_new - new_name ||
+		    memcmp(old_name, new_name, slash_new - new_name))
 			break;
-		old = slash_old + 1;
-		new = slash_new + 1;
+		old_name = slash_old + 1;
+		new_name = slash_new + 1;
 	}
-	/* p->old_name thru old is the common prefix, and old and new
+	/* p->old_name thru old_name is the common prefix, and old_name and new_name
 	 * through the end of names are renames
 	 */
-	if (old != p->old_name)
+	if (old_name != p->old_name)
 		printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
-		       (int)(old - p->old_name), p->old_name,
-		       old, new, p->score);
+		       (int)(old_name - p->old_name), p->old_name,
+		       old_name, new_name, p->score);
 	else
 		printf(" %s %s => %s (%d%%)\n", renamecopy,
 		       p->old_name, p->new_name, p->score);
@@ -4291,7 +4291,7 @@ static int add_index_file(struct apply_state *state,
 			}
 			fill_stat_cache_info(ce, &st);
 		}
-		if (write_sha1_file(buf, size, blob_type, ce->oid.hash) < 0) {
+		if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
 			free(ce);
 			return error(_("unable to create backing store "
 				       "for newly created file %s"), path);
@@ -4943,8 +4943,9 @@ int apply_parse_options(int argc, const char **argv,
 			N_("make sure the patch is applicable to the current index")),
 		OPT_BOOL(0, "cached", &state->cached,
 			N_("apply a patch without touching the working tree")),
-		OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,
-			N_("accept a patch that touches outside the working area")),
+		OPT_BOOL_F(0, "unsafe-paths", &state->unsafe_paths,
+			   N_("accept a patch that touches outside the working area"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL(0, "apply", force_apply,
 			N_("also apply the patch (use with --stat/--summary/--check)")),
 		OPT_BOOL('3', "3way", &state->threeway,
diff --git a/archive-tar.c b/archive-tar.c
index c6ed96e..3563bcb 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -111,7 +111,7 @@ static void write_trailer(void)
  * queues up writes, so that all our write(2) calls write exactly one
  * full block; pads writes to RECORDSIZE
  */
-static int stream_blocked(const unsigned char *sha1)
+static int stream_blocked(const struct object_id *oid)
 {
 	struct git_istream *st;
 	enum object_type type;
@@ -119,9 +119,9 @@ static int stream_blocked(const unsigned char *sha1)
 	char buf[BLOCKSIZE];
 	ssize_t readlen;
 
-	st = open_istream(sha1, &type, &sz, NULL);
+	st = open_istream(oid, &type, &sz, NULL);
 	if (!st)
-		return error("cannot stream blob %s", sha1_to_hex(sha1));
+		return error("cannot stream blob %s", oid_to_hex(oid));
 	for (;;) {
 		readlen = read_istream(st, buf, sizeof(buf));
 		if (readlen <= 0)
@@ -218,7 +218,7 @@ static void prepare_header(struct archiver_args *args,
 }
 
 static void write_extended_header(struct archiver_args *args,
-				  const unsigned char *sha1,
+				  const struct object_id *oid,
 				  const void *buffer, unsigned long size)
 {
 	struct ustar_header header;
@@ -226,14 +226,14 @@ static void write_extended_header(struct archiver_args *args,
 	memset(&header, 0, sizeof(header));
 	*header.typeflag = TYPEFLAG_EXT_HEADER;
 	mode = 0100666;
-	xsnprintf(header.name, sizeof(header.name), "%s.paxheader", sha1_to_hex(sha1));
+	xsnprintf(header.name, sizeof(header.name), "%s.paxheader", oid_to_hex(oid));
 	prepare_header(args, &header, mode, size);
 	write_blocked(&header, sizeof(header));
 	write_blocked(buffer, size);
 }
 
 static int write_tar_entry(struct archiver_args *args,
-			   const unsigned char *sha1,
+			   const struct object_id *oid,
 			   const char *path, size_t pathlen,
 			   unsigned int mode)
 {
@@ -257,7 +257,7 @@ static int write_tar_entry(struct archiver_args *args,
 		mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
 	} else {
 		return error("unsupported file mode: 0%o (SHA1: %s)",
-			     mode, sha1_to_hex(sha1));
+			     mode, oid_to_hex(oid));
 	}
 	if (pathlen > sizeof(header.name)) {
 		size_t plen = get_path_prefix(path, pathlen,
@@ -268,7 +268,7 @@ static int write_tar_entry(struct archiver_args *args,
 			memcpy(header.name, path + plen + 1, rest);
 		} else {
 			xsnprintf(header.name, sizeof(header.name), "%s.data",
-				  sha1_to_hex(sha1));
+				  oid_to_hex(oid));
 			strbuf_append_ext_header(&ext_header, "path",
 						 path, pathlen);
 		}
@@ -276,14 +276,14 @@ static int write_tar_entry(struct archiver_args *args,
 		memcpy(header.name, path, pathlen);
 
 	if (S_ISREG(mode) && !args->convert &&
-	    sha1_object_info(sha1, &size) == OBJ_BLOB &&
+	    oid_object_info(oid, &size) == OBJ_BLOB &&
 	    size > big_file_threshold)
 		buffer = NULL;
 	else if (S_ISLNK(mode) || S_ISREG(mode)) {
 		enum object_type type;
-		buffer = sha1_file_to_archive(args, path, sha1, old_mode, &type, &size);
+		buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size);
 		if (!buffer)
-			return error("cannot read %s", sha1_to_hex(sha1));
+			return error("cannot read %s", oid_to_hex(oid));
 	} else {
 		buffer = NULL;
 		size = 0;
@@ -292,7 +292,7 @@ static int write_tar_entry(struct archiver_args *args,
 	if (S_ISLNK(mode)) {
 		if (size > sizeof(header.linkname)) {
 			xsnprintf(header.linkname, sizeof(header.linkname),
-				  "see %s.paxheader", sha1_to_hex(sha1));
+				  "see %s.paxheader", oid_to_hex(oid));
 			strbuf_append_ext_header(&ext_header, "linkpath",
 			                         buffer, size);
 		} else
@@ -308,7 +308,7 @@ static int write_tar_entry(struct archiver_args *args,
 	prepare_header(args, &header, mode, size_in_header);
 
 	if (ext_header.len > 0) {
-		write_extended_header(args, sha1, ext_header.buf,
+		write_extended_header(args, oid, ext_header.buf,
 				      ext_header.len);
 	}
 	strbuf_release(&ext_header);
@@ -317,7 +317,7 @@ static int write_tar_entry(struct archiver_args *args,
 		if (buffer)
 			write_blocked(buffer, size);
 		else
-			err = stream_blocked(sha1);
+			err = stream_blocked(oid);
 	}
 	free(buffer);
 	return err;
diff --git a/archive-zip.c b/archive-zip.c
index e8913e5..6b20bce 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -276,7 +276,7 @@ static int entry_is_binary(const char *path, const void *buffer, size_t size)
 #define STREAM_BUFFER_SIZE (1024 * 16)
 
 static int write_zip_entry(struct archiver_args *args,
-			   const unsigned char *sha1,
+			   const struct object_id *oid,
 			   const char *path, size_t pathlen,
 			   unsigned int mode)
 {
@@ -314,7 +314,7 @@ static int write_zip_entry(struct archiver_args *args,
 
 	if (pathlen > 0xffff) {
 		return error("path too long (%d chars, SHA1: %s): %s",
-				(int)pathlen, sha1_to_hex(sha1), path);
+				(int)pathlen, oid_to_hex(oid), path);
 	}
 
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
@@ -325,7 +325,7 @@ static int write_zip_entry(struct archiver_args *args,
 		compressed_size = 0;
 		buffer = NULL;
 	} else if (S_ISREG(mode) || S_ISLNK(mode)) {
-		enum object_type type = sha1_object_info(sha1, &size);
+		enum object_type type = oid_object_info(oid, &size);
 
 		method = 0;
 		attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
@@ -337,18 +337,18 @@ static int write_zip_entry(struct archiver_args *args,
 
 		if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
 		    size > big_file_threshold) {
-			stream = open_istream(sha1, &type, &size, NULL);
+			stream = open_istream(oid, &type, &size, NULL);
 			if (!stream)
 				return error("cannot stream blob %s",
-					     sha1_to_hex(sha1));
+					     oid_to_hex(oid));
 			flags |= ZIP_STREAM;
 			out = buffer = NULL;
 		} else {
-			buffer = sha1_file_to_archive(args, path, sha1, mode,
-						      &type, &size);
+			buffer = object_file_to_archive(args, path, oid, mode,
+							&type, &size);
 			if (!buffer)
 				return error("cannot read %s",
-					     sha1_to_hex(sha1));
+					     oid_to_hex(oid));
 			crc = crc32(crc, buffer, size);
 			is_binary = entry_is_binary(path_without_prefix,
 						    buffer, size);
@@ -357,7 +357,7 @@ static int write_zip_entry(struct archiver_args *args,
 		compressed_size = (method == 0) ? size : 0;
 	} else {
 		return error("unsupported file mode: 0%o (SHA1: %s)", mode,
-				sha1_to_hex(sha1));
+				oid_to_hex(oid));
 	}
 
 	if (creator_version > max_creator_version)
diff --git a/archive.c b/archive.c
index 0b7b62a..93ab175 100644
--- a/archive.c
+++ b/archive.c
@@ -63,16 +63,16 @@ static void format_subst(const struct commit *commit,
 	free(to_free);
 }
 
-void *sha1_file_to_archive(const struct archiver_args *args,
-			   const char *path, const unsigned char *sha1,
-			   unsigned int mode, enum object_type *type,
-			   unsigned long *sizep)
+void *object_file_to_archive(const struct archiver_args *args,
+			     const char *path, const struct object_id *oid,
+			     unsigned int mode, enum object_type *type,
+			     unsigned long *sizep)
 {
 	void *buffer;
 	const struct commit *commit = args->convert ? args->commit : NULL;
 
 	path += args->baselen;
-	buffer = read_sha1_file(sha1, type, sizep);
+	buffer = read_object_file(oid, type, sizep);
 	if (buffer && S_ISREG(mode)) {
 		struct strbuf buf = STRBUF_INIT;
 		size_t size = 0;
@@ -121,7 +121,7 @@ static int check_attr_export_subst(const struct attr_check *check)
 	return check && ATTR_TRUE(check->items[1].value);
 }
 
-static int write_archive_entry(const unsigned char *sha1, const char *base,
+static int write_archive_entry(const struct object_id *oid, const char *base,
 		int baselen, const char *filename, unsigned mode, int stage,
 		void *context)
 {
@@ -153,7 +153,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-		err = write_entry(args, sha1, path.buf, path.len, mode);
+		err = write_entry(args, oid, path.buf, path.len, mode);
 		if (err)
 			return err;
 		return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
@@ -161,7 +161,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
 
 	if (args->verbose)
 		fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-	return write_entry(args, sha1, path.buf, path.len, mode);
+	return write_entry(args, oid, path.buf, path.len, mode);
 }
 
 static void queue_directory(const unsigned char *sha1,
@@ -191,14 +191,14 @@ static int write_directory(struct archiver_context *c)
 	d->path[d->len - 1] = '\0'; /* no trailing slash */
 	ret =
 		write_directory(c) ||
-		write_archive_entry(d->oid.hash, d->path, d->baselen,
+		write_archive_entry(&d->oid, d->path, d->baselen,
 				    d->path + d->baselen, d->mode,
 				    d->stage, c) != READ_TREE_RECURSIVE;
 	free(d);
 	return ret ? -1 : 0;
 }
 
-static int queue_or_write_archive_entry(const unsigned char *sha1,
+static int queue_or_write_archive_entry(const struct object_id *oid,
 		struct strbuf *base, const char *filename,
 		unsigned mode, int stage, void *context)
 {
@@ -224,14 +224,14 @@ static int queue_or_write_archive_entry(const unsigned char *sha1,
 
 		if (check_attr_export_ignore(check))
 			return 0;
-		queue_directory(sha1, base, filename,
+		queue_directory(oid->hash, base, filename,
 				mode, stage, c);
 		return READ_TREE_RECURSIVE;
 	}
 
 	if (write_directory(c))
 		return -1;
-	return write_archive_entry(sha1, base->buf, base->len, filename, mode,
+	return write_archive_entry(oid, base->buf, base->len, filename, mode,
 				   stage, context);
 }
 
@@ -250,7 +250,7 @@ int write_archive_entries(struct archiver_args *args,
 			len--;
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)len, args->base);
-		err = write_entry(args, args->tree->object.oid.hash, args->base,
+		err = write_entry(args, &args->tree->object.oid, args->base,
 				  len, 040777);
 		if (err)
 			return err;
@@ -303,7 +303,7 @@ static const struct archiver *lookup_archiver(const char *name)
 	return NULL;
 }
 
-static int reject_entry(const unsigned char *sha1, struct strbuf *base,
+static int reject_entry(const struct object_id *oid, struct strbuf *base,
 			const char *filename, unsigned mode,
 			int stage, void *context)
 {
@@ -397,8 +397,8 @@ static void parse_treeish_arg(const char **argv,
 		unsigned int mode;
 		int err;
 
-		err = get_tree_entry(tree->object.oid.hash, prefix,
-				     tree_oid.hash, &mode);
+		err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,
+				     &mode);
 		if (err || !S_ISDIR(mode))
 			die("current working directory is untracked");
 
diff --git a/archive.h b/archive.h
index 62d1d82..1f9954f 100644
--- a/archive.h
+++ b/archive.h
@@ -31,7 +31,7 @@ extern void init_tar_archiver(void);
 extern void init_zip_archiver(void);
 
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
-					const unsigned char *sha1,
+					const struct object_id *oid,
 					const char *path, size_t pathlen,
 					unsigned int mode);
 
@@ -39,9 +39,9 @@ extern int write_archive_entries(struct archiver_args *args, write_archive_entry
 extern int write_archive(int argc, const char **argv, const char *prefix, const char *name_hint, int remote);
 
 const char *archive_format_from_filename(const char *filename);
-extern void *sha1_file_to_archive(const struct archiver_args *args,
-				  const char *path, const unsigned char *sha1,
-				  unsigned int mode, enum object_type *type,
-				  unsigned long *sizep);
+extern void *object_file_to_archive(const struct archiver_args *args,
+				    const char *path, const struct object_id *oid,
+				    unsigned int mode, enum object_type *type,
+				    unsigned long *sizep);
 
 #endif	/* ARCHIVE_H */
diff --git a/bisect.c b/bisect.c
index f6d05bd..a579b50 100644
--- a/bisect.c
+++ b/bisect.c
@@ -132,7 +132,8 @@ static void show_list(const char *debug, int counted, int nr,
 		unsigned flags = commit->object.flags;
 		enum object_type type;
 		unsigned long size;
-		char *buf = read_sha1_file(commit->object.oid.hash, &type, &size);
+		char *buf = read_object_file(&commit->object.oid, &type,
+					     &size);
 		const char *subject_start;
 		int subject_len;
 
@@ -144,10 +145,10 @@ static void show_list(const char *debug, int counted, int nr,
 			fprintf(stderr, "%3d", weight(p));
 		else
 			fprintf(stderr, "---");
-		fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash));
+		fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid));
 		for (pp = commit->parents; pp; pp = pp->next)
 			fprintf(stderr, " %.*s", 8,
-				sha1_to_hex(pp->item->object.oid.hash));
+				oid_to_hex(&pp->item->object.oid));
 
 		subject_len = find_commit_subject(buf, &subject_start);
 		if (subject_len)
diff --git a/blame.c b/blame.c
index 2893f3c..78c9808 100644
--- a/blame.c
+++ b/blame.c
@@ -80,8 +80,8 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
 		struct object_id blob_oid;
 		unsigned mode;
 
-		if (!get_tree_entry(commit_oid->hash, path, blob_oid.hash, &mode) &&
-		    sha1_object_info(blob_oid.hash, NULL) == OBJ_BLOB)
+		if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
+		    oid_object_info(&blob_oid, NULL) == OBJ_BLOB)
 			return;
 	}
 
@@ -232,7 +232,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
 	convert_to_git(&the_index, path, buf.buf, buf.len, &buf, 0);
 	origin->file.ptr = buf.buf;
 	origin->file.size = buf.len;
-	pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_oid.hash);
+	pretend_object_file(buf.buf, buf.len, OBJ_BLOB, &origin->blob_oid);
 
 	/*
 	 * Read the current index, replace the path entry with
@@ -297,8 +297,8 @@ static void fill_origin_blob(struct diff_options *opt,
 		    textconv_object(o->path, o->mode, &o->blob_oid, 1, &file->ptr, &file_size))
 			;
 		else
-			file->ptr = read_sha1_file(o->blob_oid.hash, &type,
-						   &file_size);
+			file->ptr = read_object_file(&o->blob_oid, &type,
+						     &file_size);
 		file->size = file_size;
 
 		if (!file->ptr)
@@ -502,11 +502,9 @@ static int fill_blob_sha1_and_mode(struct blame_origin *origin)
 {
 	if (!is_null_oid(&origin->blob_oid))
 		return 0;
-	if (get_tree_entry(origin->commit->object.oid.hash,
-			   origin->path,
-			   origin->blob_oid.hash, &origin->mode))
+	if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
 		goto error_out;
-	if (sha1_object_info(origin->blob_oid.hash, NULL) != OBJ_BLOB)
+	if (oid_object_info(&origin->blob_oid, NULL) != OBJ_BLOB)
 		goto error_out;
 	return 0;
  error_out:
@@ -998,28 +996,29 @@ unsigned blame_entry_score(struct blame_scoreboard *sb, struct blame_entry *e)
 }
 
 /*
- * best_so_far[] and this[] are both a split of an existing blame_entry
- * that passes blame to the parent.  Maintain best_so_far the best split
- * so far, by comparing this and best_so_far and copying this into
+ * best_so_far[] and potential[] are both a split of an existing blame_entry
+ * that passes blame to the parent.  Maintain best_so_far the best split so
+ * far, by comparing potential and best_so_far and copying potential into
  * bst_so_far as needed.
  */
 static void copy_split_if_better(struct blame_scoreboard *sb,
 				 struct blame_entry *best_so_far,
-				 struct blame_entry *this)
+				 struct blame_entry *potential)
 {
 	int i;
 
-	if (!this[1].suspect)
+	if (!potential[1].suspect)
 		return;
 	if (best_so_far[1].suspect) {
-		if (blame_entry_score(sb, &this[1]) < blame_entry_score(sb, &best_so_far[1]))
+		if (blame_entry_score(sb, &potential[1]) <
+		    blame_entry_score(sb, &best_so_far[1]))
 			return;
 	}
 
 	for (i = 0; i < 3; i++)
-		blame_origin_incref(this[i].suspect);
+		blame_origin_incref(potential[i].suspect);
 	decref_split(best_so_far);
-	memcpy(best_so_far, this, sizeof(struct blame_entry [3]));
+	memcpy(best_so_far, potential, sizeof(struct blame_entry[3]));
 }
 
 /*
@@ -1046,12 +1045,12 @@ static void handle_split(struct blame_scoreboard *sb,
 	if (ent->num_lines <= tlno)
 		return;
 	if (tlno < same) {
-		struct blame_entry this[3];
+		struct blame_entry potential[3];
 		tlno += ent->s_lno;
 		same += ent->s_lno;
-		split_overlap(this, ent, tlno, plno, same, parent);
-		copy_split_if_better(sb, split, this);
-		decref_split(this);
+		split_overlap(potential, ent, tlno, plno, same, parent);
+		copy_split_if_better(sb, split, potential);
+		decref_split(potential);
 	}
 }
 
@@ -1273,7 +1272,7 @@ static void find_copy_in_parent(struct blame_scoreboard *sb,
 			struct diff_filepair *p = diff_queued_diff.queue[i];
 			struct blame_origin *norigin;
 			mmfile_t file_p;
-			struct blame_entry this[3];
+			struct blame_entry potential[3];
 
 			if (!DIFF_FILE_VALID(p->one))
 				continue; /* does not exist in parent */
@@ -1292,10 +1291,10 @@ static void find_copy_in_parent(struct blame_scoreboard *sb,
 
 			for (j = 0; j < num_ents; j++) {
 				find_copy_in_blob(sb, blame_list[j].ent,
-						  norigin, this, &file_p);
+						  norigin, potential, &file_p);
 				copy_split_if_better(sb, blame_list[j].split,
-						     this);
-				decref_split(this);
+						     potential);
+				decref_split(potential);
 			}
 			blame_origin_decref(norigin);
 		}
@@ -1830,8 +1829,8 @@ void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blam
 				    &sb->final_buf_size))
 			;
 		else
-			sb->final_buf = read_sha1_file(o->blob_oid.hash, &type,
-						       &sb->final_buf_size);
+			sb->final_buf = read_object_file(&o->blob_oid, &type,
+							 &sb->final_buf_size);
 
 		if (!sb->final_buf)
 			die(_("cannot read blob %s for path %s"),
diff --git a/builtin/add.c b/builtin/add.c
index bf01d89..9ef7fb0 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -294,7 +294,7 @@ static struct option builtin_add_options[] = {
 	OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
 	OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
 	OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
-	OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")),
+	OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0),
 	OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
 	OPT_BOOL(0, "renormalize", &add_renormalize, N_("renormalize EOL of tracked files (implies -u)")),
 	OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
@@ -534,10 +534,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	unplug_bulk_checkin();
 
 finish:
-	if (active_cache_changed) {
-		if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-			die(_("Unable to write new index file"));
-	}
+	if (write_locked_index(&the_index, &lock_file,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		die(_("Unable to write new index file"));
 
 	UNLEAK(pathspec);
 	UNLEAK(dir);
diff --git a/builtin/am.c b/builtin/am.c
index 47beddb..9c82603 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1011,6 +1011,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
 
 	if (mkdir(state->dir, 0777) < 0 && errno != EEXIST)
 		die_errno(_("failed to create directory '%s'"), state->dir);
+	delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 
 	if (split_mail(state, patch_format, paths, keep_cr) < 0) {
 		am_destroy(state);
@@ -1110,6 +1111,7 @@ static void am_next(struct am_state *state)
 
 	oidclr(&state->orig_commit);
 	unlink(am_path(state, "original-commit"));
+	delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 
 	if (!get_oid("HEAD", &head))
 		write_state_text(state, "abort-safety", oid_to_hex(&head));
@@ -1441,6 +1443,8 @@ static int parse_mail_rebase(struct am_state *state, const char *mail)
 
 	oidcpy(&state->orig_commit, &commit_oid);
 	write_state_text(state, "original-commit", oid_to_hex(&commit_oid));
+	update_ref("am", "REBASE_HEAD", &commit_oid,
+		   NULL, REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
 
 	return 0;
 }
@@ -1546,7 +1550,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 	discard_cache();
 	read_cache_from(index_path);
 
-	if (write_index_as_tree(orig_tree.hash, &the_index, index_path, 0, NULL))
+	if (write_index_as_tree(&orig_tree, &the_index, index_path, 0, NULL))
 		return error(_("Repository lacks necessary blobs to fall back on 3-way merge."));
 
 	say(state, stdout, _("Using index info to reconstruct a base tree..."));
@@ -1571,7 +1575,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
 		return error(_("Did you hand edit your patch?\n"
 				"It does not apply to blobs recorded in its index."));
 
-	if (write_index_as_tree(their_tree.hash, &the_index, index_path, 0, NULL))
+	if (write_index_as_tree(&their_tree, &the_index, index_path, 0, NULL))
 		return error("could not write tree");
 
 	say(state, stdout, _("Falling back to patching base and 3-way merge..."));
@@ -1622,7 +1626,7 @@ static void do_commit(const struct am_state *state)
 	if (run_hook_le(NULL, "pre-applypatch", NULL))
 		exit(1);
 
-	if (write_cache_as_tree(tree.hash, 0, NULL))
+	if (write_cache_as_tree(&tree, 0, NULL))
 		die(_("git write-tree failed to write a tree"));
 
 	if (!get_oid_commit("HEAD", &parent)) {
@@ -1641,8 +1645,8 @@ static void do_commit(const struct am_state *state)
 		setenv("GIT_COMMITTER_DATE",
 			state->ignore_date ? "" : state->author_date, 1);
 
-	if (commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,
-				author, state->sign_commit))
+	if (commit_tree(state->msg, state->msg_len, &tree, parents, &commit,
+			author, state->sign_commit))
 		die(_("failed to write commit object"));
 
 	reflog_msg = getenv("GIT_REFLOG_ACTION");
@@ -1831,8 +1835,7 @@ static void am_run(struct am_state *state, int resume)
 			git_config_get_bool("advice.amworkdir", &advice_amworkdir);
 
 			if (advice_amworkdir)
-				printf_ln(_("The copy of the patch that failed is found in: %s"),
-						am_path(state, "patch"));
+				printf_ln(_("Use 'git am --show-current-patch' to see the failed patch"));
 
 			die_user_resolve(state);
 		}
@@ -2001,7 +2004,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem
 	if (fast_forward_to(head_tree, head_tree, 1))
 		return -1;
 
-	if (write_cache_as_tree(index.hash, 0, NULL))
+	if (write_cache_as_tree(&index, 0, NULL))
 		return -1;
 
 	index_tree = parse_tree_indirect(&index);
@@ -2121,6 +2124,34 @@ static void am_abort(struct am_state *state)
 	am_destroy(state);
 }
 
+static int show_patch(struct am_state *state)
+{
+	struct strbuf sb = STRBUF_INIT;
+	const char *patch_path;
+	int len;
+
+	if (!is_null_oid(&state->orig_commit)) {
+		const char *av[4] = { "show", NULL, "--", NULL };
+		char *new_oid_str;
+		int ret;
+
+		av[1] = new_oid_str = xstrdup(oid_to_hex(&state->orig_commit));
+		ret = run_command_v_opt(av, RUN_GIT_CMD);
+		free(new_oid_str);
+		return ret;
+	}
+
+	patch_path = am_path(state, msgnum(state));
+	len = strbuf_read_file(&sb, patch_path, 0);
+	if (len < 0)
+		die_errno(_("failed to read '%s'"), patch_path);
+
+	setup_pager();
+	write_in_full(1, sb.buf, sb.len);
+	strbuf_release(&sb);
+	return 0;
+}
+
 /**
  * parse_options() callback that validates and sets opt->value to the
  * PATCH_FORMAT_* enum value corresponding to `arg`.
@@ -2149,7 +2180,9 @@ enum resume_mode {
 	RESUME_APPLY,
 	RESUME_RESOLVED,
 	RESUME_SKIP,
-	RESUME_ABORT
+	RESUME_ABORT,
+	RESUME_QUIT,
+	RESUME_SHOW_PATCH
 };
 
 static int git_am_config(const char *k, const char *v, void *cb)
@@ -2171,6 +2204,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 	int patch_format = PATCH_FORMAT_UNKNOWN;
 	enum resume_mode resume = RESUME_FALSE;
 	int in_progress;
+	int ret = 0;
 
 	const char * const usage[] = {
 		N_("git am [<options>] [(<mbox> | <Maildir>)...]"),
@@ -2249,6 +2283,12 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		OPT_CMDMODE(0, "abort", &resume,
 			N_("restore the original branch and abort the patching operation."),
 			RESUME_ABORT),
+		OPT_CMDMODE(0, "quit", &resume,
+			N_("abort the patching operation but keep HEAD where it is."),
+			RESUME_QUIT),
+		OPT_CMDMODE(0, "show-current-patch", &resume,
+			N_("show the patch being applied."),
+			RESUME_SHOW_PATCH),
 		OPT_BOOL(0, "committer-date-is-author-date",
 			&state.committer_date_is_author_date,
 			N_("lie about committer date")),
@@ -2317,7 +2357,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		 * stray directories.
 		 */
 		if (file_exists(state.dir) && !state.rebasing) {
-			if (resume == RESUME_ABORT) {
+			if (resume == RESUME_ABORT || resume == RESUME_QUIT) {
 				am_destroy(&state);
 				am_state_release(&state);
 				return 0;
@@ -2359,11 +2399,18 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 	case RESUME_ABORT:
 		am_abort(&state);
 		break;
+	case RESUME_QUIT:
+		am_rerere_clear();
+		am_destroy(&state);
+		break;
+	case RESUME_SHOW_PATCH:
+		ret = show_patch(&state);
+		break;
 	default:
 		die("BUG: invalid resume value");
 	}
 
 	am_state_release(&state);
 
-	return 0;
+	return ret;
 }
diff --git a/builtin/archive.c b/builtin/archive.c
index f863465..73971d0 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -55,7 +55,7 @@ static int run_remote_archiver(int argc, const char **argv,
 
 	buf = packet_read_line(fd[0], NULL);
 	if (!buf)
-		die(_("git archive: expected ACK/NAK, got EOF"));
+		die(_("git archive: expected ACK/NAK, got a flush packet"));
 	if (strcmp(buf, "ACK")) {
 		if (starts_with(buf, "NACK "))
 			die(_("git archive: NACK %s"), buf + 5);
diff --git a/builtin/blame.c b/builtin/blame.c
index 005f55a..db38c0b 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -499,7 +499,7 @@ static int read_ancestry(const char *graft_file)
 
 static int update_auto_abbrev(int auto_abbrev, struct blame_origin *suspect)
 {
-	const char *uniq = find_unique_abbrev(suspect->commit->object.oid.hash,
+	const char *uniq = find_unique_abbrev(&suspect->commit->object.oid,
 					      auto_abbrev);
 	int len = strlen(uniq);
 	if (auto_abbrev < len)
@@ -649,6 +649,15 @@ static int blame_move_callback(const struct option *option, const char *arg, int
 	return 0;
 }
 
+static int is_a_rev(const char *name)
+{
+	struct object_id oid;
+
+	if (get_oid(name, &oid))
+		return 0;
+	return OBJ_NONE < oid_object_info(&oid, NULL);
+}
+
 int cmd_blame(int argc, const char **argv, const char *prefix)
 {
 	struct rev_info revs;
@@ -720,6 +729,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	for (;;) {
 		switch (parse_options_step(&ctx, options, blame_opt_usage)) {
 		case PARSE_OPT_HELP:
+		case PARSE_OPT_ERROR:
 			exit(129);
 		case PARSE_OPT_DONE:
 			if (ctx.argv[0])
@@ -845,16 +855,15 @@ parse_done:
 	} else {
 		if (argc < 2)
 			usage_with_options(blame_opt_usage, options);
-		path = add_prefix(prefix, argv[argc - 1]);
-		if (argc == 3 && !file_exists(path)) { /* (2b) */
+		if (argc == 3 && is_a_rev(argv[argc - 1])) { /* (2b) */
 			path = add_prefix(prefix, argv[1]);
 			argv[1] = argv[2];
+		} else {	/* (2a) */
+			if (argc == 2 && is_a_rev(argv[1]) && !get_git_work_tree())
+				die("missing <path> to blame");
+			path = add_prefix(prefix, argv[argc - 1]);
 		}
 		argv[argc - 1] = "--";
-
-		setup_work_tree();
-		if (!file_exists(path))
-			die_errno("cannot stat path '%s'", path);
 	}
 
 	revs.disable_stdin = 1;
diff --git a/builtin/branch.c b/builtin/branch.c
index 8dcc2ed..5bd2a0d 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -273,7 +273,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 			       bname.buf,
 			       (flags & REF_ISBROKEN) ? "broken"
 			       : (flags & REF_ISSYMREF) ? target
-			       : find_unique_abbrev(oid.hash, DEFAULT_ABBREV));
+			       : find_unique_abbrev(&oid, DEFAULT_ABBREV));
 		}
 		delete_branch_config(bname.buf);
 
@@ -615,7 +615,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
 		OPT_BOOL(0, "edit-description", &edit_description,
 			 N_("edit the description for the branch")),
-		OPT__FORCE(&force, N_("force creation, move/rename, deletion")),
+		OPT__FORCE(&force, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE),
 		OPT_MERGED(&filter, N_("print only branches that are merged")),
 		OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
 		OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index cf9ea5c..2c46d25 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -32,7 +32,7 @@ static int filter_object(const char *path, unsigned mode,
 {
 	enum object_type type;
 
-	*buf = read_sha1_file(oid->hash, &type, size);
+	*buf = read_object_file(oid, &type, size);
 	if (!*buf)
 		return error(_("cannot read object %s '%s'"),
 			     oid_to_hex(oid), path);
@@ -76,8 +76,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 	buf = NULL;
 	switch (opt) {
 	case 't':
-		oi.typename = &sb;
-		if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
+		oi.type_name = &sb;
+		if (oid_object_info_extended(&oid, &oi, flags) < 0)
 			die("git cat-file: could not get object info");
 		if (sb.len) {
 			printf("%s\n", sb.buf);
@@ -88,7 +88,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 
 	case 's':
 		oi.sizep = &size;
-		if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
+		if (oid_object_info_extended(&oid, &oi, flags) < 0)
 			die("git cat-file: could not get object info");
 		printf("%lu\n", size);
 		return 0;
@@ -116,7 +116,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 		/* else fallthrough */
 
 	case 'p':
-		type = sha1_object_info(oid.hash, NULL);
+		type = oid_object_info(&oid, NULL);
 		if (type < 0)
 			die("Not a valid object name %s", obj_name);
 
@@ -130,7 +130,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 
 		if (type == OBJ_BLOB)
 			return stream_blob_to_fd(1, &oid, NULL, 0);
-		buf = read_sha1_file(oid.hash, &type, &size);
+		buf = read_object_file(&oid, &type, &size);
 		if (!buf)
 			die("Cannot read object %s", obj_name);
 
@@ -140,8 +140,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 	case 0:
 		if (type_from_string(exp_type) == OBJ_BLOB) {
 			struct object_id blob_oid;
-			if (sha1_object_info(oid.hash, NULL) == OBJ_TAG) {
-				char *buffer = read_sha1_file(oid.hash, &type, &size);
+			if (oid_object_info(&oid, NULL) == OBJ_TAG) {
+				char *buffer = read_object_file(&oid, &type,
+								&size);
 				const char *target;
 				if (!skip_prefix(buffer, "object ", &target) ||
 				    get_oid_hex(target, &blob_oid))
@@ -150,7 +151,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 			} else
 				oidcpy(&blob_oid, &oid);
 
-			if (sha1_object_info(blob_oid.hash, NULL) == OBJ_BLOB)
+			if (oid_object_info(&blob_oid, NULL) == OBJ_BLOB)
 				return stream_blob_to_fd(1, &blob_oid, NULL, 0);
 			/*
 			 * we attempted to dereference a tag to a blob
@@ -159,7 +160,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 			 * fall-back to the usual case.
 			 */
 		}
-		buf = read_object_with_reference(oid.hash, exp_type, &size, NULL);
+		buf = read_object_with_reference(&oid, exp_type, &size, NULL);
 		break;
 
 	default:
@@ -229,7 +230,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len,
 		if (data->mark_query)
 			data->info.typep = &data->type;
 		else
-			strbuf_addstr(sb, typename(data->type));
+			strbuf_addstr(sb, type_name(data->type));
 	} else if (is_atom("objectsize", atom, len)) {
 		if (data->mark_query)
 			data->info.sizep = &data->size;
@@ -304,8 +305,9 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
 				enum object_type type;
 				if (!textconv_object(data->rest, 0100644, oid,
 						     1, &contents, &size))
-					contents = read_sha1_file(oid->hash, &type,
-								  &size);
+					contents = read_object_file(oid,
+								    &type,
+								    &size);
 				if (!contents)
 					die("could not convert '%s' %s",
 					    oid_to_hex(oid), data->rest);
@@ -321,7 +323,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
 		unsigned long size;
 		void *contents;
 
-		contents = read_sha1_file(oid->hash, &type, &size);
+		contents = read_object_file(oid, &type, &size);
 		if (!contents)
 			die("object %s disappeared", oid_to_hex(oid));
 		if (type != data->type)
@@ -340,8 +342,8 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt,
 	struct strbuf buf = STRBUF_INIT;
 
 	if (!data->skip_object_info &&
-	    sha1_object_info_extended(data->oid.hash, &data->info,
-				      OBJECT_INFO_LOOKUP_REPLACE) < 0) {
+	    oid_object_info_extended(&data->oid, &data->info,
+				     OBJECT_INFO_LOOKUP_REPLACE) < 0) {
 		printf("%s missing\n",
 		       obj_name ? obj_name : oid_to_hex(&data->oid));
 		fflush(stdout);
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 3e280b9..ec9a959 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -72,7 +72,7 @@ static int check_ignore(struct dir_struct *dir,
 {
 	const char *full_path;
 	char *seen;
-	int num_ignored = 0, dtype = DT_UNKNOWN, i;
+	int num_ignored = 0, i;
 	struct exclude *exclude;
 	struct pathspec pathspec;
 
@@ -104,6 +104,7 @@ static int check_ignore(struct dir_struct *dir,
 		full_path = pathspec.items[i].match;
 		exclude = NULL;
 		if (!seen[i]) {
+			int dtype = DT_UNKNOWN;
 			exclude = last_exclude_matching(dir, &the_index,
 							full_path, &dtype);
 		}
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index b0e78b8..a730f6a 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -157,7 +157,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	struct option builtin_checkout_index_options[] = {
 		OPT_BOOL('a', "all", &all,
 			N_("check out all files in the index")),
-		OPT__FORCE(&force, N_("force overwrite of existing files")),
+		OPT__FORCE(&force, N_("force overwrite of existing files"), 0),
 		OPT__QUIET(&quiet,
 			N_("no warning for existing files and files not in index")),
 		OPT_BOOL('n', "no-create", &not_new,
diff --git a/builtin/checkout.c b/builtin/checkout.c
index c54c78d..b49b582 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -54,19 +54,19 @@ struct checkout_opts {
 	struct tree *source_tree;
 };
 
-static int post_checkout_hook(struct commit *old, struct commit *new,
+static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
 			      int changed)
 {
 	return run_hook_le(NULL, "post-checkout",
-			   oid_to_hex(old ? &old->object.oid : &null_oid),
-			   oid_to_hex(new ? &new->object.oid : &null_oid),
+			   oid_to_hex(old_commit ? &old_commit->object.oid : &null_oid),
+			   oid_to_hex(new_commit ? &new_commit->object.oid : &null_oid),
 			   changed ? "1" : "0", NULL);
-	/* "new" can be NULL when checking out from the index before
+	/* "new_commit" can be NULL when checking out from the index before
 	   a commit exists. */
 
 }
 
-static int update_some(const unsigned char *sha1, struct strbuf *base,
+static int update_some(const struct object_id *oid, struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
 	int len;
@@ -78,7 +78,7 @@ static int update_some(const unsigned char *sha1, struct strbuf *base,
 
 	len = base->len + strlen(pathname);
 	ce = xcalloc(1, cache_entry_size(len));
-	hashcpy(ce->oid.hash, sha1);
+	oidcpy(&ce->oid, oid);
 	memcpy(ce->name, base->buf, base->len);
 	memcpy(ce->name + base->len, pathname, len - base->len);
 	ce->ce_flags = create_ce_flags(0) | CE_UPDATE;
@@ -227,8 +227,7 @@ static int checkout_merged(int pos, const struct checkout *state)
 	 * (it also writes the merge result to the object database even
 	 * when it may contain conflicts).
 	 */
-	if (write_sha1_file(result_buf.ptr, result_buf.size,
-			    blob_type, oid.hash))
+	if (write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid))
 		die(_("Unable to add merge result for '%s'"), path);
 	free(result_buf.ptr);
 	ce = make_cache_entry(mode, oid.hash, path, 2, 0);
@@ -406,10 +405,10 @@ static void describe_detached_head(const char *msg, struct commit *commit)
 		pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
 	if (print_sha1_ellipsis()) {
 		fprintf(stderr, "%s %s... %s\n", msg,
-			find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+			find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf);
 	} else {
 		fprintf(stderr, "%s %s %s\n", msg,
-			find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+			find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf);
 	}
 	strbuf_release(&sb);
 }
@@ -472,8 +471,8 @@ static void setup_branch_path(struct branch_info *branch)
 }
 
 static int merge_working_tree(const struct checkout_opts *opts,
-			      struct branch_info *old,
-			      struct branch_info *new,
+			      struct branch_info *old_branch_info,
+			      struct branch_info *new_branch_info,
 			      int *writeout_error)
 {
 	int ret;
@@ -485,7 +484,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 
 	resolve_undo_clear();
 	if (opts->force) {
-		ret = reset_tree(new->commit->tree, opts, 1, writeout_error);
+		ret = reset_tree(new_branch_info->commit->tree, opts, 1, writeout_error);
 		if (ret)
 			return ret;
 	} else {
@@ -511,7 +510,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 		topts.initial_checkout = is_cache_unborn();
 		topts.update = 1;
 		topts.merge = 1;
-		topts.gently = opts->merge && old->commit;
+		topts.gently = opts->merge && old_branch_info->commit;
 		topts.verbose_update = opts->show_progress;
 		topts.fn = twoway_merge;
 		if (opts->overwrite_ignore) {
@@ -519,11 +518,11 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			topts.dir->flags |= DIR_SHOW_IGNORED;
 			setup_standard_excludes(topts.dir);
 		}
-		tree = parse_tree_indirect(old->commit ?
-					   &old->commit->object.oid :
+		tree = parse_tree_indirect(old_branch_info->commit ?
+					   &old_branch_info->commit->object.oid :
 					   the_hash_algo->empty_tree);
 		init_tree_desc(&trees[0], tree->buffer, tree->size);
-		tree = parse_tree_indirect(&new->commit->object.oid);
+		tree = parse_tree_indirect(&new_branch_info->commit->object.oid);
 		init_tree_desc(&trees[1], tree->buffer, tree->size);
 
 		ret = unpack_trees(2, trees, &topts);
@@ -540,10 +539,10 @@ static int merge_working_tree(const struct checkout_opts *opts,
 				return 1;
 
 			/*
-			 * Without old->commit, the below is the same as
+			 * Without old_branch_info->commit, the below is the same as
 			 * the two-tree unpack we already tried and failed.
 			 */
-			if (!old->commit)
+			if (!old_branch_info->commit)
 				return 1;
 
 			/* Do more real merge */
@@ -571,18 +570,18 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			o.verbosity = 0;
 			work = write_tree_from_memory(&o);
 
-			ret = reset_tree(new->commit->tree, opts, 1,
+			ret = reset_tree(new_branch_info->commit->tree, opts, 1,
 					 writeout_error);
 			if (ret)
 				return ret;
-			o.ancestor = old->name;
-			o.branch1 = new->name;
+			o.ancestor = old_branch_info->name;
+			o.branch1 = new_branch_info->name;
 			o.branch2 = "local";
-			ret = merge_trees(&o, new->commit->tree, work,
-				old->commit->tree, &result);
+			ret = merge_trees(&o, new_branch_info->commit->tree, work,
+				old_branch_info->commit->tree, &result);
 			if (ret < 0)
 				exit(128);
-			ret = reset_tree(new->commit->tree, opts, 0,
+			ret = reset_tree(new_branch_info->commit->tree, opts, 0,
 					 writeout_error);
 			strbuf_release(&o.obuf);
 			if (ret)
@@ -600,25 +599,25 @@ static int merge_working_tree(const struct checkout_opts *opts,
 		die(_("unable to write new index file"));
 
 	if (!opts->force && !opts->quiet)
-		show_local_changes(&new->commit->object, &opts->diff_options);
+		show_local_changes(&new_branch_info->commit->object, &opts->diff_options);
 
 	return 0;
 }
 
-static void report_tracking(struct branch_info *new)
+static void report_tracking(struct branch_info *new_branch_info)
 {
 	struct strbuf sb = STRBUF_INIT;
-	struct branch *branch = branch_get(new->name);
+	struct branch *branch = branch_get(new_branch_info->name);
 
-	if (!format_tracking_info(branch, &sb))
+	if (!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL))
 		return;
 	fputs(sb.buf, stdout);
 	strbuf_release(&sb);
 }
 
 static void update_refs_for_switch(const struct checkout_opts *opts,
-				   struct branch_info *old,
-				   struct branch_info *new)
+				   struct branch_info *old_branch_info,
+				   struct branch_info *new_branch_info)
 {
 	struct strbuf msg = STRBUF_INIT;
 	const char *old_desc, *reflog_msg;
@@ -645,69 +644,69 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 			free(refname);
 		}
 		else
-			create_branch(opts->new_branch, new->name,
+			create_branch(opts->new_branch, new_branch_info->name,
 				      opts->new_branch_force ? 1 : 0,
 				      opts->new_branch_force ? 1 : 0,
 				      opts->new_branch_log,
 				      opts->quiet,
 				      opts->track);
-		new->name = opts->new_branch;
-		setup_branch_path(new);
+		new_branch_info->name = opts->new_branch;
+		setup_branch_path(new_branch_info);
 	}
 
-	old_desc = old->name;
-	if (!old_desc && old->commit)
-		old_desc = oid_to_hex(&old->commit->object.oid);
+	old_desc = old_branch_info->name;
+	if (!old_desc && old_branch_info->commit)
+		old_desc = oid_to_hex(&old_branch_info->commit->object.oid);
 
 	reflog_msg = getenv("GIT_REFLOG_ACTION");
 	if (!reflog_msg)
 		strbuf_addf(&msg, "checkout: moving from %s to %s",
-			old_desc ? old_desc : "(invalid)", new->name);
+			old_desc ? old_desc : "(invalid)", new_branch_info->name);
 	else
 		strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg));
 
-	if (!strcmp(new->name, "HEAD") && !new->path && !opts->force_detach) {
+	if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) {
 		/* Nothing to do. */
-	} else if (opts->force_detach || !new->path) {	/* No longer on any branch. */
-		update_ref(msg.buf, "HEAD", &new->commit->object.oid, NULL,
+	} else if (opts->force_detach || !new_branch_info->path) {	/* No longer on any branch. */
+		update_ref(msg.buf, "HEAD", &new_branch_info->commit->object.oid, NULL,
 			   REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
 		if (!opts->quiet) {
-			if (old->path &&
+			if (old_branch_info->path &&
 			    advice_detached_head && !opts->force_detach)
-				detach_advice(new->name);
-			describe_detached_head(_("HEAD is now at"), new->commit);
+				detach_advice(new_branch_info->name);
+			describe_detached_head(_("HEAD is now at"), new_branch_info->commit);
 		}
-	} else if (new->path) {	/* Switch branches. */
-		if (create_symref("HEAD", new->path, msg.buf) < 0)
+	} else if (new_branch_info->path) {	/* Switch branches. */
+		if (create_symref("HEAD", new_branch_info->path, msg.buf) < 0)
 			die(_("unable to update HEAD"));
 		if (!opts->quiet) {
-			if (old->path && !strcmp(new->path, old->path)) {
+			if (old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) {
 				if (opts->new_branch_force)
 					fprintf(stderr, _("Reset branch '%s'\n"),
-						new->name);
+						new_branch_info->name);
 				else
 					fprintf(stderr, _("Already on '%s'\n"),
-						new->name);
+						new_branch_info->name);
 			} else if (opts->new_branch) {
 				if (opts->branch_exists)
-					fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
+					fprintf(stderr, _("Switched to and reset branch '%s'\n"), new_branch_info->name);
 				else
-					fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
+					fprintf(stderr, _("Switched to a new branch '%s'\n"), new_branch_info->name);
 			} else {
 				fprintf(stderr, _("Switched to branch '%s'\n"),
-					new->name);
+					new_branch_info->name);
 			}
 		}
-		if (old->path && old->name) {
-			if (!ref_exists(old->path) && reflog_exists(old->path))
-				delete_reflog(old->path);
+		if (old_branch_info->path && old_branch_info->name) {
+			if (!ref_exists(old_branch_info->path) && reflog_exists(old_branch_info->path))
+				delete_reflog(old_branch_info->path);
 		}
 	}
 	remove_branch_state();
 	strbuf_release(&msg);
 	if (!opts->quiet &&
-	    (new->path || (!opts->force_detach && !strcmp(new->name, "HEAD"))))
-		report_tracking(new);
+	    (new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD"))))
+		report_tracking(new_branch_info);
 }
 
 static int add_pending_uninteresting_ref(const char *refname,
@@ -721,7 +720,7 @@ static int add_pending_uninteresting_ref(const char *refname,
 static void describe_one_orphan(struct strbuf *sb, struct commit *commit)
 {
 	strbuf_addstr(sb, "  ");
-	strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV);
+	strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV);
 	strbuf_addch(sb, ' ');
 	if (!parse_commit(commit))
 		pp_commit_easy(CMIT_FMT_ONELINE, commit, sb);
@@ -779,7 +778,7 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
 			" git branch <new-branch-name> %s\n\n",
 			/* Give ngettext() the count */
 			lost),
-			find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+			find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
 }
 
 /*
@@ -787,10 +786,10 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
  * HEAD.  If it is not reachable from any ref, this is the last chance
  * for the user to do so without resorting to reflog.
  */
-static void orphaned_commit_warning(struct commit *old, struct commit *new)
+static void orphaned_commit_warning(struct commit *old_commit, struct commit *new_commit)
 {
 	struct rev_info revs;
-	struct object *object = &old->object;
+	struct object *object = &old_commit->object;
 
 	init_revisions(&revs, NULL);
 	setup_revisions(0, NULL, &revs, NULL);
@@ -799,57 +798,57 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
 	add_pending_object(&revs, object, oid_to_hex(&object->oid));
 
 	for_each_ref(add_pending_uninteresting_ref, &revs);
-	add_pending_oid(&revs, "HEAD", &new->object.oid, UNINTERESTING);
+	add_pending_oid(&revs, "HEAD", &new_commit->object.oid, UNINTERESTING);
 
 	if (prepare_revision_walk(&revs))
 		die(_("internal error in revision walk"));
-	if (!(old->object.flags & UNINTERESTING))
-		suggest_reattach(old, &revs);
+	if (!(old_commit->object.flags & UNINTERESTING))
+		suggest_reattach(old_commit, &revs);
 	else
-		describe_detached_head(_("Previous HEAD position was"), old);
+		describe_detached_head(_("Previous HEAD position was"), old_commit);
 
 	/* Clean up objects used, as they will be reused. */
 	clear_commit_marks_all(ALL_REV_FLAGS);
 }
 
 static int switch_branches(const struct checkout_opts *opts,
-			   struct branch_info *new)
+			   struct branch_info *new_branch_info)
 {
 	int ret = 0;
-	struct branch_info old;
+	struct branch_info old_branch_info;
 	void *path_to_free;
 	struct object_id rev;
 	int flag, writeout_error = 0;
-	memset(&old, 0, sizeof(old));
-	old.path = path_to_free = resolve_refdup("HEAD", 0, &rev, &flag);
-	if (old.path)
-		old.commit = lookup_commit_reference_gently(&rev, 1);
+	memset(&old_branch_info, 0, sizeof(old_branch_info));
+	old_branch_info.path = path_to_free = resolve_refdup("HEAD", 0, &rev, &flag);
+	if (old_branch_info.path)
+		old_branch_info.commit = lookup_commit_reference_gently(&rev, 1);
 	if (!(flag & REF_ISSYMREF))
-		old.path = NULL;
+		old_branch_info.path = NULL;
 
-	if (old.path)
-		skip_prefix(old.path, "refs/heads/", &old.name);
+	if (old_branch_info.path)
+		skip_prefix(old_branch_info.path, "refs/heads/", &old_branch_info.name);
 
-	if (!new->name) {
-		new->name = "HEAD";
-		new->commit = old.commit;
-		if (!new->commit)
+	if (!new_branch_info->name) {
+		new_branch_info->name = "HEAD";
+		new_branch_info->commit = old_branch_info.commit;
+		if (!new_branch_info->commit)
 			die(_("You are on a branch yet to be born"));
-		parse_commit_or_die(new->commit);
+		parse_commit_or_die(new_branch_info->commit);
 	}
 
-	ret = merge_working_tree(opts, &old, new, &writeout_error);
+	ret = merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error);
 	if (ret) {
 		free(path_to_free);
 		return ret;
 	}
 
-	if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
-		orphaned_commit_warning(old.commit, new->commit);
+	if (!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit)
+		orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit);
 
-	update_refs_for_switch(opts, &old, new);
+	update_refs_for_switch(opts, &old_branch_info, new_branch_info);
 
-	ret = post_checkout_hook(old.commit, new->commit, 1);
+	ret = post_checkout_hook(old_branch_info.commit, new_branch_info->commit, 1);
 	free(path_to_free);
 	return ret || writeout_error;
 }
@@ -870,7 +869,7 @@ static int git_checkout_config(const char *var, const char *value, void *cb)
 
 static int parse_branchname_arg(int argc, const char **argv,
 				int dwim_new_local_branch_ok,
-				struct branch_info *new,
+				struct branch_info *new_branch_info,
 				struct checkout_opts *opts,
 				struct object_id *rev)
 {
@@ -988,22 +987,22 @@ static int parse_branchname_arg(int argc, const char **argv,
 	argv++;
 	argc--;
 
-	new->name = arg;
-	setup_branch_path(new);
+	new_branch_info->name = arg;
+	setup_branch_path(new_branch_info);
 
-	if (!check_refname_format(new->path, 0) &&
-	    !read_ref(new->path, &branch_rev))
+	if (!check_refname_format(new_branch_info->path, 0) &&
+	    !read_ref(new_branch_info->path, &branch_rev))
 		oidcpy(rev, &branch_rev);
 	else
-		new->path = NULL; /* not an existing branch */
+		new_branch_info->path = NULL; /* not an existing branch */
 
-	new->commit = lookup_commit_reference_gently(rev, 1);
-	if (!new->commit) {
+	new_branch_info->commit = lookup_commit_reference_gently(rev, 1);
+	if (!new_branch_info->commit) {
 		/* not a commit */
 		*source_tree = parse_tree_indirect(rev);
 	} else {
-		parse_commit_or_die(new->commit);
-		*source_tree = new->commit->tree;
+		parse_commit_or_die(new_branch_info->commit);
+		*source_tree = new_branch_info->commit->tree;
 	}
 
 	if (!*source_tree)                   /* case (1): want a tree */
@@ -1043,7 +1042,7 @@ static int switch_unborn_to_new_branch(const struct checkout_opts *opts)
 }
 
 static int checkout_branch(struct checkout_opts *opts,
-			   struct branch_info *new)
+			   struct branch_info *new_branch_info)
 {
 	if (opts->pathspec.nr)
 		die(_("paths cannot be used with switching branches"));
@@ -1072,21 +1071,21 @@ static int checkout_branch(struct checkout_opts *opts,
 	} else if (opts->track == BRANCH_TRACK_UNSPECIFIED)
 		opts->track = git_branch_track;
 
-	if (new->name && !new->commit)
+	if (new_branch_info->name && !new_branch_info->commit)
 		die(_("Cannot switch branch to a non-commit '%s'"),
-		    new->name);
+		    new_branch_info->name);
 
-	if (new->path && !opts->force_detach && !opts->new_branch &&
+	if (new_branch_info->path && !opts->force_detach && !opts->new_branch &&
 	    !opts->ignore_other_worktrees) {
 		int flag;
 		char *head_ref = resolve_refdup("HEAD", 0, NULL, &flag);
 		if (head_ref &&
-		    (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
-			die_if_checked_out(new->path, 1);
+		    (!(flag & REF_ISSYMREF) || strcmp(head_ref, new_branch_info->path)))
+			die_if_checked_out(new_branch_info->path, 1);
 		free(head_ref);
 	}
 
-	if (!new->commit && opts->new_branch) {
+	if (!new_branch_info->commit && opts->new_branch) {
 		struct object_id rev;
 		int flag;
 
@@ -1094,13 +1093,13 @@ static int checkout_branch(struct checkout_opts *opts,
 		    (flag & REF_ISSYMREF) && is_null_oid(&rev))
 			return switch_unborn_to_new_branch(opts);
 	}
-	return switch_branches(opts, new);
+	return switch_branches(opts, new_branch_info);
 }
 
 int cmd_checkout(int argc, const char **argv, const char *prefix)
 {
 	struct checkout_opts opts;
-	struct branch_info new;
+	struct branch_info new_branch_info;
 	char *conflict_style = NULL;
 	int dwim_new_local_branch = 1;
 	struct option options[] = {
@@ -1118,9 +1117,12 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 			    2),
 		OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout their version for unmerged files"),
 			    3),
-		OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)")),
+		OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
-		OPT_BOOL(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")),
+		OPT_BOOL_F(0, "overwrite-ignore", &opts.overwrite_ignore,
+			   N_("update ignored files (default)"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_STRING(0, "conflict", &conflict_style, N_("style"),
 			   N_("conflict style (merge or diff3)")),
 		OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
@@ -1138,7 +1140,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 	};
 
 	memset(&opts, 0, sizeof(opts));
-	memset(&new, 0, sizeof(new));
+	memset(&new_branch_info, 0, sizeof(new_branch_info));
 	opts.overwrite_ignore = 1;
 	opts.prefix = prefix;
 	opts.show_progress = -1;
@@ -1210,7 +1212,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 			opts.track == BRANCH_TRACK_UNSPECIFIED &&
 			!opts.new_branch;
 		int n = parse_branchname_arg(argc, argv, dwim_ok,
-					     &new, &opts, &rev);
+					     &new_branch_info, &opts, &rev);
 		argv += n;
 		argc -= n;
 	}
@@ -1253,7 +1255,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 
 	UNLEAK(opts);
 	if (opts.patch_mode || opts.pathspec.nr)
-		return checkout_paths(&opts, new.name);
+		return checkout_paths(&opts, new_branch_info.name);
 	else
-		return checkout_branch(&opts, &new);
+		return checkout_branch(&opts, &new_branch_info);
 }
diff --git a/builtin/clean.c b/builtin/clean.c
index 189e206..fad533a 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -909,7 +909,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	struct option options[] = {
 		OPT__QUIET(&quiet, N_("do not print names of files removed")),
 		OPT__DRY_RUN(&dry_run, N_("dry run")),
-		OPT__FORCE(&force, N_("force")),
+		OPT__FORCE(&force, N_("force"), PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL('i', "interactive", &interactive, N_("interactive cleaning")),
 		OPT_BOOL('d', NULL, &remove_directories,
 				N_("remove whole directories")),
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 2177251..ecf4219 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -58,7 +58,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 				usage(commit_tree_usage);
 			if (get_oid_commit(argv[i], &oid))
 				die("Not a valid object name %s", argv[i]);
-			assert_sha1_type(oid.hash, OBJ_COMMIT);
+			assert_oid_type(&oid, OBJ_COMMIT);
 			new_parent(lookup_commit(&oid), &parents);
 			continue;
 		}
@@ -117,8 +117,8 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 			die_errno("git commit-tree: failed to read");
 	}
 
-	if (commit_tree(buffer.buf, buffer.len, tree_oid.hash, parents,
-			commit_oid.hash, NULL, sign_commit)) {
+	if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid,
+			NULL, sign_commit)) {
 		strbuf_release(&buffer);
 		return 1;
 	}
diff --git a/builtin/commit.c b/builtin/commit.c
index 5dd766a..37fcb55 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -389,13 +389,9 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 		if (active_cache_changed
 		    || !cache_tree_fully_valid(active_cache_tree))
 			update_main_cache_tree(WRITE_TREE_SILENT);
-		if (active_cache_changed) {
-			if (write_locked_index(&the_index, &index_lock,
-					       COMMIT_LOCK))
-				die(_("unable to write new_index file"));
-		} else {
-			rollback_lock_file(&index_lock);
-		}
+		if (write_locked_index(&the_index, &index_lock,
+				       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+			die(_("unable to write new_index file"));
 		commit_style = COMMIT_AS_IS;
 		ret = get_index_file();
 		goto out;
@@ -1061,6 +1057,9 @@ static void finalize_deferred_config(struct wt_status *s)
 		s->show_branch = status_deferred_config.show_branch;
 	if (s->show_branch < 0)
 		s->show_branch = 0;
+
+	if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
+		s->ahead_behind_flags = AHEAD_BEHIND_FULL;
 }
 
 static int parse_and_validate_options(int argc, const char *argv[],
@@ -1277,6 +1276,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 			 N_("show branch information")),
 		OPT_BOOL(0, "show-stash", &s.show_stash,
 			 N_("show stash information")),
+		OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
+			 N_("compute full ahead/behind values")),
 		{ OPTION_CALLBACK, 0, "porcelain", &status_format,
 		  N_("version"), N_("machine-readable output"),
 		  PARSE_OPT_OPTARG, opt_parse_porcelain },
@@ -1402,6 +1403,7 @@ int run_commit_hook(int editor_is_used, const char *index_file, const char *name
 
 int cmd_commit(int argc, const char **argv, const char *prefix)
 {
+	const char *argv_gc_auto[] = {"gc", "--auto", NULL};
 	static struct wt_status s;
 	static struct option builtin_commit_options[] = {
 		OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
@@ -1437,6 +1439,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
 			    STATUS_FORMAT_SHORT),
 		OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")),
+		OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
+			 N_("compute full ahead/behind values")),
 		OPT_SET_INT(0, "porcelain", &status_format,
 			    N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
 		OPT_SET_INT(0, "long", &status_format,
@@ -1579,8 +1583,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		append_merge_tag_headers(parents, &tail);
 	}
 
-	if (commit_tree_extended(sb.buf, sb.len, active_cache_tree->oid.hash,
-			 parents, oid.hash, author_ident.buf, sign_commit, extra)) {
+	if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
+				 parents, &oid, author_ident.buf, sign_commit,
+				 extra)) {
 		rollback_index_files();
 		die(_("failed to write commit object"));
 	}
@@ -1606,6 +1611,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		     "not exceeded, and then \"git reset HEAD\" to recover."));
 
 	rerere(0);
+	run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
 	run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
 	if (amend && !no_post_rewrite) {
 		commit_post_rewrite(current_head, &oid);
diff --git a/builtin/config.c b/builtin/config.c
index ab5f954..01169dd 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -48,6 +48,13 @@ static int show_origin;
 #define ACTION_GET_COLORBOOL (1<<14)
 #define ACTION_GET_URLMATCH (1<<15)
 
+/*
+ * The actions "ACTION_LIST | ACTION_GET_*" which may produce more than
+ * one line of output and which should therefore be paged.
+ */
+#define PAGING_ACTIONS (ACTION_LIST | ACTION_GET_ALL | \
+			ACTION_GET_REGEXP | ACTION_GET_URLMATCH)
+
 #define TYPE_BOOL (1<<0)
 #define TYPE_INT (1<<1)
 #define TYPE_BOOL_OR_INT (1<<2)
@@ -594,6 +601,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		usage_with_options(builtin_config_usage, builtin_config_options);
 	}
 
+	if (actions & PAGING_ACTIONS)
+		setup_auto_pager("config", 1);
+
 	if (actions == ACTION_LIST) {
 		check_argc(argc, 0, 0);
 		if (config_with_options(show_all_config, NULL,
diff --git a/builtin/describe.c b/builtin/describe.c
index c428984..de840f9 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -285,7 +285,7 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
 
 static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)
 {
-	strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid->hash, abbrev));
+	strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid, abbrev));
 }
 
 static void describe_commit(struct object_id *oid, struct strbuf *dst)
@@ -383,7 +383,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 	if (!match_cnt) {
 		struct object_id *cmit_oid = &cmit->object.oid;
 		if (always) {
-			strbuf_add_unique_abbrev(dst, cmit_oid->hash, abbrev);
+			strbuf_add_unique_abbrev(dst, cmit_oid, abbrev);
 			if (suffix)
 				strbuf_addstr(dst, suffix);
 			return;
@@ -502,7 +502,7 @@ static void describe(const char *arg, int last_one)
 
 	if (cmit)
 		describe_commit(&oid, &sb);
-	else if (lookup_blob(&oid))
+	else if (oid_object_info(&oid, NULL) == OBJ_BLOB)
 		describe_blob(oid, &sb);
 	else
 		die(_("%s is neither a commit nor blob"), arg);
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index b775a75..4736151 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -76,7 +76,7 @@ static int diff_tree_stdin(char *line)
 	if (obj->type == OBJ_TREE)
 		return stdin_diff_trees((struct tree *)obj, p);
 	error("Object %s is a %s, not a commit or tree",
-	      oid_to_hex(&oid), typename(obj->type));
+	      oid_to_hex(&oid), type_name(obj->type));
 	return -1;
 }
 
diff --git a/builtin/difftool.c b/builtin/difftool.c
index bcc79d1..ee8dce0 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -306,7 +306,7 @@ static char *get_symlink(const struct object_id *oid, const char *path)
 	} else {
 		enum object_type type;
 		unsigned long size;
-		data = read_sha1_file(oid->hash, &type, &size);
+		data = read_object_file(oid, &type, &size);
 		if (!data)
 			die(_("could not read object %s for symlink %s"),
 				oid_to_hex(oid), path);
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 796d0cd..a15898d 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -237,10 +237,10 @@ static void export_blob(const struct object_id *oid)
 		object = (struct object *)lookup_blob(oid);
 		eaten = 0;
 	} else {
-		buf = read_sha1_file(oid->hash, &type, &size);
+		buf = read_object_file(oid, &type, &size);
 		if (!buf)
 			die ("Could not read blob %s", oid_to_hex(oid));
-		if (check_sha1_signature(oid->hash, buf, size, typename(type)) < 0)
+		if (check_object_signature(oid, buf, size, type_name(type)) < 0)
 			die("sha1 mismatch in blob %s", oid_to_hex(oid));
 		object = parse_object_buffer(oid, type, size, buf, &eaten);
 	}
@@ -682,7 +682,7 @@ static void handle_tag(const char *name, struct tag *tag)
 		return;
 	}
 
-	buf = read_sha1_file(tag->object.oid.hash, &type, &size);
+	buf = read_object_file(&tag->object.oid, &type, &size);
 	if (!buf)
 		die ("Could not read tag %s", oid_to_hex(&tag->object.oid));
 	message = memmem(buf, size, "\n\n", 2);
@@ -757,7 +757,7 @@ static void handle_tag(const char *name, struct tag *tag)
 			if (tagged->type != OBJ_COMMIT) {
 				die ("Tag %s tags unexported %s!",
 				     oid_to_hex(&tag->object.oid),
-				     typename(tagged->type));
+				     type_name(tagged->type));
 			}
 			p = (struct commit *)tagged;
 			for (;;) {
@@ -839,7 +839,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info)
 		if (!commit) {
 			warning("%s: Unexpected object of type %s, skipping.",
 				e->name,
-				typename(e->item->type));
+				type_name(e->item->type));
 			continue;
 		}
 
@@ -851,7 +851,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info)
 			continue;
 		default: /* OBJ_TAG (nested tags) is already handled */
 			warning("Tag points to object of unexpected type %s, skipping.",
-				typename(commit->object.type));
+				type_name(commit->object.type));
 			continue;
 		}
 
@@ -947,7 +947,7 @@ static void import_marks(char *input_file)
 		if (last_idnum < mark)
 			last_idnum = mark;
 
-		type = sha1_object_info(oid.hash, NULL);
+		type = oid_object_info(&oid, NULL);
 		if (type < 0)
 			die("object not found: %s", oid_to_hex(&oid));
 
diff --git a/builtin/fetch.c b/builtin/fetch.c
index a39e9d7..dcdfc66 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -39,6 +39,10 @@ static int fetch_prune_config = -1; /* unspecified */
 static int prune = -1; /* unspecified */
 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
 
+static int fetch_prune_tags_config = -1; /* unspecified */
+static int prune_tags = -1; /* unspecified */
+#define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
+
 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
 static int progress = -1;
 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
@@ -66,6 +70,11 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(k, "fetch.prunetags")) {
+		fetch_prune_tags_config = git_config_bool(k, v);
+		return 0;
+	}
+
 	if (!strcmp(k, "submodule.recurse")) {
 		int r = git_config_bool(k, v) ?
 			RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
@@ -117,7 +126,7 @@ static struct option builtin_fetch_options[] = {
 		 N_("append to .git/FETCH_HEAD instead of overwriting")),
 	OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
 		   N_("path to upload pack on remote end")),
-	OPT__FORCE(&force, N_("force overwrite of local branch")),
+	OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
 	OPT_BOOL('m', "multiple", &multiple,
 		 N_("fetch from multiple remotes")),
 	OPT_SET_INT('t', "tags", &tags,
@@ -128,6 +137,8 @@ static struct option builtin_fetch_options[] = {
 		    N_("number of submodules fetched in parallel")),
 	OPT_BOOL('p', "prune", &prune,
 		 N_("prune remote-tracking branches no longer on remote")),
+	OPT_BOOL('P', "prune-tags", &prune_tags,
+		 N_("prune local tags no longer on remote and clobber changed tags")),
 	{ OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
 		    N_("control recursive fetching of submodules"),
 		    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
@@ -626,7 +637,7 @@ static int update_local_ref(struct ref *ref,
 	struct branch *current_branch = branch_get(NULL);
 	const char *pretty_ref = prettify_refname(ref->name);
 
-	type = sha1_object_info(ref->new_oid.hash, NULL);
+	type = oid_object_info(&ref->new_oid, NULL);
 	if (type < 0)
 		die(_("object %s not found"), oid_to_hex(&ref->new_oid));
 
@@ -697,9 +708,9 @@ static int update_local_ref(struct ref *ref,
 	if (in_merge_bases(current, updated)) {
 		struct strbuf quickref = STRBUF_INIT;
 		int r;
-		strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
 		strbuf_addstr(&quickref, "..");
-		strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
 		if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
 		    (recurse_submodules != RECURSE_SUBMODULES_ON))
 			check_for_new_submodule_commits(&ref->new_oid);
@@ -712,9 +723,9 @@ static int update_local_ref(struct ref *ref,
 	} else if (force || ref->force) {
 		struct strbuf quickref = STRBUF_INIT;
 		int r;
-		strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
 		strbuf_addstr(&quickref, "...");
-		strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
 		if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
 		    (recurse_submodules != RECURSE_SUBMODULES_ON))
 			check_for_new_submodule_commits(&ref->new_oid);
@@ -1220,6 +1231,8 @@ static void add_options_to_argv(struct argv_array *argv)
 		argv_array_push(argv, "--dry-run");
 	if (prune != -1)
 		argv_array_push(argv, prune ? "--prune" : "--no-prune");
+	if (prune_tags != -1)
+		argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
 	if (update_head_ok)
 		argv_array_push(argv, "--update-head-ok");
 	if (force)
@@ -1323,12 +1336,15 @@ static inline void fetch_one_setup_partial(struct remote *remote)
 	return;
 }
 
-static int fetch_one(struct remote *remote, int argc, const char **argv)
+static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
 {
 	static const char **refs = NULL;
 	struct refspec *refspec;
 	int ref_nr = 0;
+	int j = 0;
 	int exit_code;
+	int maybe_prune_tags;
+	int remote_via_config = remote_is_configured(remote, 0);
 
 	if (!remote)
 		die(_("No remote repository specified.  Please, specify either a URL or a\n"
@@ -1338,18 +1354,39 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
 
 	if (prune < 0) {
 		/* no command line request */
-		if (0 <= gtransport->remote->prune)
-			prune = gtransport->remote->prune;
+		if (0 <= remote->prune)
+			prune = remote->prune;
 		else if (0 <= fetch_prune_config)
 			prune = fetch_prune_config;
 		else
 			prune = PRUNE_BY_DEFAULT;
 	}
 
+	if (prune_tags < 0) {
+		/* no command line request */
+		if (0 <= remote->prune_tags)
+			prune_tags = remote->prune_tags;
+		else if (0 <= fetch_prune_tags_config)
+			prune_tags = fetch_prune_tags_config;
+		else
+			prune_tags = PRUNE_TAGS_BY_DEFAULT;
+	}
+
+	maybe_prune_tags = prune_tags_ok && prune_tags;
+	if (maybe_prune_tags && remote_via_config)
+		add_prune_tags_to_fetch_refspec(remote);
+
+	if (argc > 0 || (maybe_prune_tags && !remote_via_config)) {
+		size_t nr_alloc = st_add3(argc, maybe_prune_tags, 1);
+		refs = xcalloc(nr_alloc, sizeof(const char *));
+		if (maybe_prune_tags) {
+			refs[j++] = xstrdup("refs/tags/*:refs/tags/*");
+			ref_nr++;
+		}
+	}
+
 	if (argc > 0) {
-		int j = 0;
 		int i;
-		refs = xcalloc(st_add(argc, 1), sizeof(const char *));
 		for (i = 0; i < argc; i++) {
 			if (!strcmp(argv[i], "tag")) {
 				i++;
@@ -1359,9 +1396,8 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
 						    argv[i], argv[i]);
 			} else
 				refs[j++] = argv[i];
+			ref_nr++;
 		}
-		refs[j] = NULL;
-		ref_nr = j;
 	}
 
 	sigchain_push_common(unlock_pack_on_signal);
@@ -1380,6 +1416,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	struct string_list list = STRING_LIST_INIT_DUP;
 	struct remote *remote = NULL;
 	int result = 0;
+	int prune_tags_ok = 1;
 	struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
 
 	packet_trace_identity("fetch");
@@ -1446,6 +1483,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		} else {
 			/* Zero or one remotes */
 			remote = remote_get(argv[0]);
+			prune_tags_ok = (argc == 1);
 			argc--;
 			argv++;
 		}
@@ -1454,7 +1492,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	if (remote) {
 		if (filter_options.choice || repository_format_partial_clone)
 			fetch_one_setup_partial(remote);
-		result = fetch_one(remote, argc, argv);
+		result = fetch_one(remote, argc, argv, prune_tags_ok);
 	} else {
 		if (filter_options.choice)
 			die(_("--filter can only be used with the remote configured in core.partialClone"));
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 8e8a15e..bd680be 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -485,10 +485,10 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
 	struct strbuf tagbuf = STRBUF_INIT;
 
 	for (i = 0; i < origins.nr; i++) {
-		unsigned char *sha1 = origins.items[i].util;
+		struct object_id *oid = origins.items[i].util;
 		enum object_type type;
 		unsigned long size, len;
-		char *buf = read_sha1_file(sha1, &type, &size);
+		char *buf = read_object_file(oid, &type, &size);
 		struct strbuf sig = STRBUF_INIT;
 
 		if (!buf || type != OBJ_TAG)
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 3ef25fa..13c0a80 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -67,12 +67,12 @@ static const char *printable_type(struct object *obj)
 	const char *ret;
 
 	if (obj->type == OBJ_NONE) {
-		enum object_type type = sha1_object_info(obj->oid.hash, NULL);
+		enum object_type type = oid_object_info(&obj->oid, NULL);
 		if (type > 0)
 			object_as_type(obj, type, 0);
 	}
 
-	ret = typename(obj->type);
+	ret = type_name(obj->type);
 	if (!ret)
 		ret = "unknown";
 
@@ -139,7 +139,7 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 		printf("broken link from %7s %s\n",
 			   printable_type(parent), describe_object(parent));
 		printf("broken link from %7s %s\n",
-			   (type == OBJ_ANY ? "unknown" : typename(type)), "unknown");
+			   (type == OBJ_ANY ? "unknown" : type_name(type)), "unknown");
 		errors_found |= ERROR_REACHABLE;
 		return 1;
 	}
@@ -182,7 +182,13 @@ static void mark_object_reachable(struct object *obj)
 
 static int traverse_one_object(struct object *obj)
 {
-	return fsck_walk(obj, obj, &fsck_walk_options);
+	int result = fsck_walk(obj, obj, &fsck_walk_options);
+
+	if (obj->type == OBJ_TREE) {
+		struct tree *tree = (struct tree *)obj;
+		free_tree_buffer(tree);
+	}
+	return result;
 }
 
 static int traverse_reachable(void)
@@ -509,7 +515,7 @@ static struct object *parse_loose_object(const struct object_id *oid,
 	unsigned long size;
 	int eaten;
 
-	if (read_loose_object(path, oid->hash, &type, &size, &contents) < 0)
+	if (read_loose_object(path, oid, &type, &size, &contents) < 0)
 		return NULL;
 
 	if (!contents && type != OBJ_BLOB)
diff --git a/builtin/gc.c b/builtin/gc.c
index b00238c..cef38e5 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -362,8 +362,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 			N_("prune unreferenced objects"),
 			PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
 		OPT_BOOL(0, "aggressive", &aggressive, N_("be more thorough (increased runtime)")),
-		OPT_BOOL(0, "auto", &auto_gc, N_("enable auto-gc mode")),
-		OPT_BOOL(0, "force", &force, N_("force running gc even if there may be another gc running")),
+		OPT_BOOL_F(0, "auto", &auto_gc, N_("enable auto-gc mode"),
+			   PARSE_OPT_NOCOMPLETE),
+		OPT_BOOL_F(0, "force", &force,
+			   N_("force running gc even if there may be another gc running"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_END()
 	};
 
diff --git a/builtin/grep.c b/builtin/grep.c
index 1e9cdbd..5f32d2c 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -93,8 +93,7 @@ static pthread_cond_t cond_result;
 
 static int skip_first_line;
 
-static void add_work(struct grep_opt *opt, enum grep_source_type type,
-		     const char *name, const char *path, const void *id)
+static void add_work(struct grep_opt *opt, const struct grep_source *gs)
 {
 	grep_lock();
 
@@ -102,7 +101,7 @@ static void add_work(struct grep_opt *opt, enum grep_source_type type,
 		pthread_cond_wait(&cond_write, &grep_mutex);
 	}
 
-	grep_source_init(&todo[todo_end].source, type, name, path, id);
+	todo[todo_end].source = *gs;
 	if (opt->binary != GREP_BINARY_TEXT)
 		grep_source_load_driver(&todo[todo_end].source);
 	todo[todo_end].done = 0;
@@ -308,7 +307,7 @@ static void *lock_and_read_oid_file(const struct object_id *oid, enum object_typ
 	void *data;
 
 	grep_read_lock();
-	data = read_sha1_file(oid->hash, type, size);
+	data = read_object_file(oid, type, size);
 	grep_read_unlock();
 	return data;
 }
@@ -318,6 +317,7 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 		     const char *path)
 {
 	struct strbuf pathbuf = STRBUF_INIT;
+	struct grep_source gs;
 
 	if (opt->relative && opt->prefix_length) {
 		quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf);
@@ -326,19 +326,22 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 		strbuf_addstr(&pathbuf, filename);
 	}
 
+	grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
+	strbuf_release(&pathbuf);
+
 #ifndef NO_PTHREADS
 	if (num_threads) {
-		add_work(opt, GREP_SOURCE_OID, pathbuf.buf, path, oid);
-		strbuf_release(&pathbuf);
+		/*
+		 * add_work() copies gs and thus assumes ownership of
+		 * its fields, so do not call grep_source_clear()
+		 */
+		add_work(opt, &gs);
 		return 0;
 	} else
 #endif
 	{
-		struct grep_source gs;
 		int hit;
 
-		grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
-		strbuf_release(&pathbuf);
 		hit = grep_source(opt, &gs);
 
 		grep_source_clear(&gs);
@@ -349,25 +352,29 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 static int grep_file(struct grep_opt *opt, const char *filename)
 {
 	struct strbuf buf = STRBUF_INIT;
+	struct grep_source gs;
 
 	if (opt->relative && opt->prefix_length)
 		quote_path_relative(filename, opt->prefix, &buf);
 	else
 		strbuf_addstr(&buf, filename);
 
+	grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
+	strbuf_release(&buf);
+
 #ifndef NO_PTHREADS
 	if (num_threads) {
-		add_work(opt, GREP_SOURCE_FILE, buf.buf, filename, filename);
-		strbuf_release(&buf);
+		/*
+		 * add_work() copies gs and thus assumes ownership of
+		 * its fields, so do not call grep_source_clear()
+		 */
+		add_work(opt, &gs);
 		return 0;
 	} else
 #endif
 	{
-		struct grep_source gs;
 		int hit;
 
-		grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
-		strbuf_release(&buf);
 		hit = grep_source(opt, &gs);
 
 		grep_source_clear(&gs);
@@ -446,7 +453,7 @@ static int grep_submodule(struct grep_opt *opt, struct repository *superproject,
 		object = parse_object_or_die(oid, oid_to_hex(oid));
 
 		grep_read_lock();
-		data = read_object_with_reference(object->oid.hash, tree_type,
+		data = read_object_with_reference(&object->oid, tree_type,
 						  &size, NULL);
 		grep_read_unlock();
 
@@ -608,7 +615,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 		int hit, len;
 
 		grep_read_lock();
-		data = read_object_with_reference(obj->oid.hash, tree_type,
+		data = read_object_with_reference(&obj->oid, tree_type,
 						  &size, NULL);
 		grep_read_unlock();
 
@@ -628,7 +635,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 		free(data);
 		return hit;
 	}
-	die(_("unable to grep from object of type %s"), typename(obj->type));
+	die(_("unable to grep from object of type %s"), type_name(obj->type));
 }
 
 static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
@@ -833,8 +840,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		OPT_BOOL('L', "files-without-match",
 			&opt.unmatch_name_only,
 			N_("show only the names of files without match")),
-		OPT_BOOL('z', "null", &opt.null_following_name,
-			N_("print NUL after filenames")),
+		OPT_BOOL_F('z', "null", &opt.null_following_name,
+			   N_("print NUL after filenames"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL('c', "count", &opt.count,
 			N_("show the number of matches instead of matching lines")),
 		OPT__COLOR(&opt.color, N_("highlight matches")),
@@ -885,9 +893,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		OPT_GROUP(""),
 		{ OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager,
 			N_("pager"), N_("show matching files in the pager"),
-			PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
-		OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
-			 N_("allow calling of grep(1) (ignored by this build)")),
+			PARSE_OPT_OPTARG | PARSE_OPT_NOCOMPLETE,
+			NULL, (intptr_t)default_pager },
+		OPT_BOOL_F(0, "ext-grep", &external_grep_allowed__ignored,
+			   N_("allow calling of grep(1) (ignored by this build)"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_END()
 	};
 
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index c532ff9..526da5c 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -24,7 +24,8 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
 	if (strbuf_read(&buf, fd, 4096) < 0)
 		ret = -1;
 	else
-		ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
+		ret = hash_object_file_literally(buf.buf, buf.len, type, oid,
+						 flags);
 	strbuf_release(&buf);
 	return ret;
 }
diff --git a/builtin/help.c b/builtin/help.c
index d3c8fc4..598867c 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -194,11 +194,11 @@ static void do_add_man_viewer_info(const char *name,
 				   size_t len,
 				   const char *value)
 {
-	struct man_viewer_info_list *new;
-	FLEX_ALLOC_MEM(new, name, name, len);
-	new->info = xstrdup(value);
-	new->next = man_viewer_info_list;
-	man_viewer_info_list = new;
+	struct man_viewer_info_list *new_man_viewer;
+	FLEX_ALLOC_MEM(new_man_viewer, name, name, len);
+	new_man_viewer->info = xstrdup(value);
+	new_man_viewer->next = man_viewer_info_list;
+	man_viewer_info_list = new_man_viewer;
 }
 
 static int add_man_viewer_path(const char *name,
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 1d6bc87..d81473e 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -50,6 +50,7 @@ struct thread_local {
 	int pack_fd;
 };
 
+/* Remember to update object flag allocation in object.h */
 #define FLAG_LINK (1u<<20)
 #define FLAG_CHECKED (1u<<21)
 
@@ -59,7 +60,7 @@ struct ofs_delta_entry {
 };
 
 struct ref_delta_entry {
-	unsigned char sha1[20];
+	struct object_id oid;
 	int obj_no;
 };
 
@@ -92,7 +93,7 @@ static unsigned int input_offset, input_len;
 static off_t consumed_bytes;
 static off_t max_input_size;
 static unsigned deepest_delta;
-static git_SHA_CTX input_ctx;
+static git_hash_ctx input_ctx;
 static uint32_t input_crc32;
 static int input_fd, output_fd;
 static const char *curr_pack;
@@ -222,14 +223,14 @@ static unsigned check_object(struct object *obj)
 
 	if (!(obj->flags & FLAG_CHECKED)) {
 		unsigned long size;
-		int type = sha1_object_info(obj->oid.hash, &size);
+		int type = oid_object_info(&obj->oid, &size);
 		if (type <= 0)
 			die(_("did not receive expected object %s"),
 			      oid_to_hex(&obj->oid));
 		if (type != obj->type)
 			die(_("object %s: expected type %s, found %s"),
 			    oid_to_hex(&obj->oid),
-			    typename(obj->type), typename(type));
+			    type_name(obj->type), type_name(type));
 		obj->flags |= FLAG_CHECKED;
 		return 1;
 	}
@@ -254,7 +255,7 @@ static void flush(void)
 	if (input_offset) {
 		if (output_fd >= 0)
 			write_or_die(output_fd, input_buffer, input_offset);
-		git_SHA1_Update(&input_ctx, input_buffer, input_offset);
+		the_hash_algo->update_fn(&input_ctx, input_buffer, input_offset);
 		memmove(input_buffer, input_buffer + input_offset, input_len);
 		input_offset = 0;
 	}
@@ -327,7 +328,7 @@ static const char *open_pack_file(const char *pack_name)
 		output_fd = -1;
 		nothread_data.pack_fd = input_fd;
 	}
-	git_SHA1_Init(&input_ctx);
+	the_hash_algo->init_fn(&input_ctx);
 	return pack_name;
 }
 
@@ -438,22 +439,22 @@ static int is_delta_type(enum object_type type)
 }
 
 static void *unpack_entry_data(off_t offset, unsigned long size,
-			       enum object_type type, unsigned char *sha1)
+			       enum object_type type, struct object_id *oid)
 {
 	static char fixed_buf[8192];
 	int status;
 	git_zstream stream;
 	void *buf;
-	git_SHA_CTX c;
+	git_hash_ctx c;
 	char hdr[32];
 	int hdrlen;
 
 	if (!is_delta_type(type)) {
-		hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), size) + 1;
-		git_SHA1_Init(&c);
-		git_SHA1_Update(&c, hdr, hdrlen);
+		hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), size) + 1;
+		the_hash_algo->init_fn(&c);
+		the_hash_algo->update_fn(&c, hdr, hdrlen);
 	} else
-		sha1 = NULL;
+		oid = NULL;
 	if (type == OBJ_BLOB && size > big_file_threshold)
 		buf = fixed_buf;
 	else
@@ -470,8 +471,8 @@ static void *unpack_entry_data(off_t offset, unsigned long size,
 		stream.avail_in = input_len;
 		status = git_inflate(&stream, 0);
 		use(input_len - stream.avail_in);
-		if (sha1)
-			git_SHA1_Update(&c, last_out, stream.next_out - last_out);
+		if (oid)
+			the_hash_algo->update_fn(&c, last_out, stream.next_out - last_out);
 		if (buf == fixed_buf) {
 			stream.next_out = buf;
 			stream.avail_out = sizeof(fixed_buf);
@@ -480,15 +481,15 @@ static void *unpack_entry_data(off_t offset, unsigned long size,
 	if (stream.total_out != size || status != Z_STREAM_END)
 		bad_object(offset, _("inflate returned %d"), status);
 	git_inflate_end(&stream);
-	if (sha1)
-		git_SHA1_Final(sha1, &c);
+	if (oid)
+		the_hash_algo->final_fn(oid->hash, &c);
 	return buf == fixed_buf ? NULL : buf;
 }
 
 static void *unpack_raw_entry(struct object_entry *obj,
 			      off_t *ofs_offset,
-			      unsigned char *ref_sha1,
-			      unsigned char *sha1)
+			      struct object_id *ref_oid,
+			      struct object_id *oid)
 {
 	unsigned char *p;
 	unsigned long size, c;
@@ -516,8 +517,8 @@ static void *unpack_raw_entry(struct object_entry *obj,
 
 	switch (obj->type) {
 	case OBJ_REF_DELTA:
-		hashcpy(ref_sha1, fill(20));
-		use(20);
+		hashcpy(ref_oid->hash, fill(the_hash_algo->rawsz));
+		use(the_hash_algo->rawsz);
 		break;
 	case OBJ_OFS_DELTA:
 		p = fill(1);
@@ -547,7 +548,7 @@ static void *unpack_raw_entry(struct object_entry *obj,
 	}
 	obj->hdr_size = consumed_bytes - obj->idx.offset;
 
-	data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, sha1);
+	data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, oid);
 	obj->idx.crc32 = input_crc32;
 	return data;
 }
@@ -672,18 +673,18 @@ static void find_ofs_delta_children(off_t offset,
 	*last_index = last;
 }
 
-static int compare_ref_delta_bases(const unsigned char *sha1,
-				   const unsigned char *sha2,
+static int compare_ref_delta_bases(const struct object_id *oid1,
+				   const struct object_id *oid2,
 				   enum object_type type1,
 				   enum object_type type2)
 {
 	int cmp = type1 - type2;
 	if (cmp)
 		return cmp;
-	return hashcmp(sha1, sha2);
+	return oidcmp(oid1, oid2);
 }
 
-static int find_ref_delta(const unsigned char *sha1, enum object_type type)
+static int find_ref_delta(const struct object_id *oid, enum object_type type)
 {
 	int first = 0, last = nr_ref_deltas;
 
@@ -692,7 +693,7 @@ static int find_ref_delta(const unsigned char *sha1, enum object_type type)
 		struct ref_delta_entry *delta = &ref_deltas[next];
 		int cmp;
 
-		cmp = compare_ref_delta_bases(sha1, delta->sha1,
+		cmp = compare_ref_delta_bases(oid, &delta->oid,
 					      type, objects[delta->obj_no].type);
 		if (!cmp)
 			return next;
@@ -705,11 +706,11 @@ static int find_ref_delta(const unsigned char *sha1, enum object_type type)
 	return -first-1;
 }
 
-static void find_ref_delta_children(const unsigned char *sha1,
+static void find_ref_delta_children(const struct object_id *oid,
 				    int *first_index, int *last_index,
 				    enum object_type type)
 {
-	int first = find_ref_delta(sha1, type);
+	int first = find_ref_delta(oid, type);
 	int last = first;
 	int end = nr_ref_deltas - 1;
 
@@ -718,9 +719,9 @@ static void find_ref_delta_children(const unsigned char *sha1,
 		*last_index = -1;
 		return;
 	}
-	while (first > 0 && !hashcmp(ref_deltas[first - 1].sha1, sha1))
+	while (first > 0 && !oidcmp(&ref_deltas[first - 1].oid, oid))
 		--first;
-	while (last < end && !hashcmp(ref_deltas[last + 1].sha1, sha1))
+	while (last < end && !oidcmp(&ref_deltas[last + 1].oid, oid))
 		++last;
 	*first_index = first;
 	*last_index = last;
@@ -772,7 +773,7 @@ static int check_collison(struct object_entry *entry)
 
 	memset(&data, 0, sizeof(data));
 	data.entry = entry;
-	data.st = open_istream(entry->idx.oid.hash, &type, &size, NULL);
+	data.st = open_istream(&entry->idx.oid, &type, &size, NULL);
 	if (!data.st)
 		return -1;
 	if (size != entry->size || type != entry->type)
@@ -811,12 +812,12 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 		enum object_type has_type;
 		unsigned long has_size;
 		read_lock();
-		has_type = sha1_object_info(oid->hash, &has_size);
+		has_type = oid_object_info(oid, &has_size);
 		if (has_type < 0)
 			die(_("cannot read existing object info %s"), oid_to_hex(oid));
 		if (has_type != type || has_size != size)
 			die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
-		has_data = read_sha1_file(oid->hash, &has_type, &has_size);
+		has_data = read_object_file(oid, &has_type, &has_size);
 		read_unlock();
 		if (!data)
 			data = new_data = get_data_from_pack(obj_entry);
@@ -828,7 +829,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 		free(has_data);
 	}
 
-	if (strict) {
+	if (strict || do_fsck_object) {
 		read_lock();
 		if (type == OBJ_BLOB) {
 			struct blob *blob = lookup_blob(oid);
@@ -850,11 +851,11 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 			obj = parse_object_buffer(oid, type, size, buf,
 						  &eaten);
 			if (!obj)
-				die(_("invalid %s"), typename(type));
+				die(_("invalid %s"), type_name(type));
 			if (do_fsck_object &&
 			    fsck_object(obj, buf, size, &fsck_options))
 				die(_("Error in object"));
-			if (fsck_walk(obj, NULL, &fsck_options))
+			if (strict && fsck_walk(obj, NULL, &fsck_options))
 				die(_("Not all child objects of %s are reachable"), oid_to_hex(&obj->oid));
 
 			if (obj->type == OBJ_TREE) {
@@ -959,9 +960,8 @@ static void resolve_delta(struct object_entry *delta_obj,
 	free(delta_data);
 	if (!result->data)
 		bad_object(delta_obj->idx.offset, _("failed to apply delta"));
-	hash_sha1_file(result->data, result->size,
-		       typename(delta_obj->real_type),
-		       delta_obj->idx.oid.hash);
+	hash_object_file(result->data, result->size,
+			 type_name(delta_obj->real_type), &delta_obj->idx.oid);
 	sha1_object(result->data, NULL, result->size, delta_obj->real_type,
 		    &delta_obj->idx.oid);
 	counter_lock();
@@ -993,7 +993,7 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base,
 						  struct base_data *prev_base)
 {
 	if (base->ref_last == -1 && base->ofs_last == -1) {
-		find_ref_delta_children(base->obj->idx.oid.hash,
+		find_ref_delta_children(&base->obj->idx.oid,
 					&base->ref_first, &base->ref_last,
 					OBJ_REF_DELTA);
 
@@ -1077,7 +1077,7 @@ static int compare_ref_delta_entry(const void *a, const void *b)
 	const struct ref_delta_entry *delta_a = a;
 	const struct ref_delta_entry *delta_b = b;
 
-	return hashcmp(delta_a->sha1, delta_b->sha1);
+	return oidcmp(&delta_a->oid, &delta_b->oid);
 }
 
 static void resolve_base(struct object_entry *obj)
@@ -1120,11 +1120,11 @@ static void *threaded_second_pass(void *data)
  * - calculate SHA1 of all non-delta objects;
  * - remember base (SHA1 or offset) for all deltas.
  */
-static void parse_pack_objects(unsigned char *sha1)
+static void parse_pack_objects(unsigned char *hash)
 {
 	int i, nr_delays = 0;
 	struct ofs_delta_entry *ofs_delta = ofs_deltas;
-	unsigned char ref_delta_sha1[20];
+	struct object_id ref_delta_oid;
 	struct stat st;
 
 	if (verbose)
@@ -1134,8 +1134,8 @@ static void parse_pack_objects(unsigned char *sha1)
 	for (i = 0; i < nr_objects; i++) {
 		struct object_entry *obj = &objects[i];
 		void *data = unpack_raw_entry(obj, &ofs_delta->offset,
-					      ref_delta_sha1,
-					      obj->idx.oid.hash);
+					      &ref_delta_oid,
+					      &obj->idx.oid);
 		obj->real_type = obj->type;
 		if (obj->type == OBJ_OFS_DELTA) {
 			nr_ofs_deltas++;
@@ -1143,7 +1143,7 @@ static void parse_pack_objects(unsigned char *sha1)
 			ofs_delta++;
 		} else if (obj->type == OBJ_REF_DELTA) {
 			ALLOC_GROW(ref_deltas, nr_ref_deltas + 1, ref_deltas_alloc);
-			hashcpy(ref_deltas[nr_ref_deltas].sha1, ref_delta_sha1);
+			oidcpy(&ref_deltas[nr_ref_deltas].oid, &ref_delta_oid);
 			ref_deltas[nr_ref_deltas].obj_no = i;
 			nr_ref_deltas++;
 		} else if (!data) {
@@ -1161,10 +1161,10 @@ static void parse_pack_objects(unsigned char *sha1)
 
 	/* Check pack integrity */
 	flush();
-	git_SHA1_Final(sha1, &input_ctx);
-	if (hashcmp(fill(20), sha1))
+	the_hash_algo->final_fn(hash, &input_ctx);
+	if (hashcmp(fill(the_hash_algo->rawsz), hash))
 		die(_("pack is corrupted (SHA1 mismatch)"));
-	use(20);
+	use(the_hash_algo->rawsz);
 
 	/* If input_fd is a file, we should have reached its end now. */
 	if (fstat(input_fd, &st))
@@ -1240,21 +1240,21 @@ static void resolve_deltas(void)
 /*
  * Third pass:
  * - append objects to convert thin pack to full pack if required
- * - write the final 20-byte SHA-1
+ * - write the final pack hash
  */
-static void fix_unresolved_deltas(struct sha1file *f);
-static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1)
+static void fix_unresolved_deltas(struct hashfile *f);
+static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_hash)
 {
 	if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) {
 		stop_progress(&progress);
-		/* Flush remaining pack final 20-byte SHA1. */
+		/* Flush remaining pack final hash. */
 		flush();
 		return;
 	}
 
 	if (fix_thin_pack) {
-		struct sha1file *f;
-		unsigned char read_sha1[20], tail_sha1[20];
+		struct hashfile *f;
+		unsigned char read_hash[GIT_MAX_RAWSZ], tail_hash[GIT_MAX_RAWSZ];
 		struct strbuf msg = STRBUF_INIT;
 		int nr_unresolved = nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas;
 		int nr_objects_initial = nr_objects;
@@ -1263,7 +1263,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
 		REALLOC_ARRAY(objects, nr_objects + nr_unresolved + 1);
 		memset(objects + nr_objects + 1, 0,
 		       nr_unresolved * sizeof(*objects));
-		f = sha1fd(output_fd, curr_pack);
+		f = hashfd(output_fd, curr_pack);
 		fix_unresolved_deltas(f);
 		strbuf_addf(&msg, Q_("completed with %d local object",
 				     "completed with %d local objects",
@@ -1271,12 +1271,12 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
 			    nr_objects - nr_objects_initial);
 		stop_progress_msg(&progress, msg.buf);
 		strbuf_release(&msg);
-		sha1close(f, tail_sha1, 0);
-		hashcpy(read_sha1, pack_sha1);
-		fixup_pack_header_footer(output_fd, pack_sha1,
+		hashclose(f, tail_hash, 0);
+		hashcpy(read_hash, pack_hash);
+		fixup_pack_header_footer(output_fd, pack_hash,
 					 curr_pack, nr_objects,
-					 read_sha1, consumed_bytes-20);
-		if (hashcmp(read_sha1, tail_sha1) != 0)
+					 read_hash, consumed_bytes-the_hash_algo->rawsz);
+		if (hashcmp(read_hash, tail_hash) != 0)
 			die(_("Unexpected tail checksum for %s "
 			      "(disk corruption?)"), curr_pack);
 	}
@@ -1287,7 +1287,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
 		    nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas);
 }
 
-static int write_compressed(struct sha1file *f, void *in, unsigned int size)
+static int write_compressed(struct hashfile *f, void *in, unsigned int size)
 {
 	git_zstream stream;
 	int status;
@@ -1301,7 +1301,7 @@ static int write_compressed(struct sha1file *f, void *in, unsigned int size)
 		stream.next_out = outbuf;
 		stream.avail_out = sizeof(outbuf);
 		status = git_deflate(&stream, Z_FINISH);
-		sha1write(f, outbuf, sizeof(outbuf) - stream.avail_out);
+		hashwrite(f, outbuf, sizeof(outbuf) - stream.avail_out);
 	} while (status == Z_OK);
 
 	if (status != Z_STREAM_END)
@@ -1311,7 +1311,7 @@ static int write_compressed(struct sha1file *f, void *in, unsigned int size)
 	return size;
 }
 
-static struct object_entry *append_obj_to_pack(struct sha1file *f,
+static struct object_entry *append_obj_to_pack(struct hashfile *f,
 			       const unsigned char *sha1, void *buf,
 			       unsigned long size, enum object_type type)
 {
@@ -1328,7 +1328,7 @@ static struct object_entry *append_obj_to_pack(struct sha1file *f,
 	}
 	header[n++] = c;
 	crc32_begin(f);
-	sha1write(f, header, n);
+	hashwrite(f, header, n);
 	obj[0].size = size;
 	obj[0].hdr_size = n;
 	obj[0].type = type;
@@ -1336,7 +1336,7 @@ static struct object_entry *append_obj_to_pack(struct sha1file *f,
 	obj[1].idx.offset = obj[0].idx.offset + n;
 	obj[1].idx.offset += write_compressed(f, buf, size);
 	obj[0].idx.crc32 = crc32_end(f);
-	sha1flush(f);
+	hashflush(f);
 	hashcpy(obj->idx.oid.hash, sha1);
 	return obj;
 }
@@ -1348,7 +1348,7 @@ static int delta_pos_compare(const void *_a, const void *_b)
 	return a->obj_no - b->obj_no;
 }
 
-static void fix_unresolved_deltas(struct sha1file *f)
+static void fix_unresolved_deltas(struct hashfile *f)
 {
 	struct ref_delta_entry **sorted_by_pos;
 	int i;
@@ -1375,14 +1375,15 @@ static void fix_unresolved_deltas(struct sha1file *f)
 
 		if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
 			continue;
-		base_obj->data = read_sha1_file(d->sha1, &type, &base_obj->size);
+		base_obj->data = read_object_file(&d->oid, &type,
+						  &base_obj->size);
 		if (!base_obj->data)
 			continue;
 
-		if (check_sha1_signature(d->sha1, base_obj->data,
-				base_obj->size, typename(type)))
-			die(_("local object %s is corrupt"), sha1_to_hex(d->sha1));
-		base_obj->obj = append_obj_to_pack(f, d->sha1,
+		if (check_object_signature(&d->oid, base_obj->data,
+				base_obj->size, type_name(type)))
+			die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
+		base_obj->obj = append_obj_to_pack(f, d->oid.hash,
 					base_obj->data, base_obj->size, type);
 		find_unresolved_deltas(base_obj);
 		display_progress(progress, nr_resolved_deltas);
@@ -1404,7 +1405,7 @@ static const char *derive_filename(const char *pack_name, const char *suffix,
 }
 
 static void write_special_file(const char *suffix, const char *msg,
-			       const char *pack_name, const unsigned char *sha1,
+			       const char *pack_name, const unsigned char *hash,
 			       const char **report)
 {
 	struct strbuf name_buf = STRBUF_INIT;
@@ -1415,7 +1416,7 @@ static void write_special_file(const char *suffix, const char *msg,
 	if (pack_name)
 		filename = derive_filename(pack_name, suffix, &name_buf);
 	else
-		filename = odb_pack_name(&name_buf, sha1, suffix);
+		filename = odb_pack_name(&name_buf, hash, suffix);
 
 	fd = odb_pack_keep(filename);
 	if (fd < 0) {
@@ -1439,7 +1440,7 @@ static void write_special_file(const char *suffix, const char *msg,
 static void final(const char *final_pack_name, const char *curr_pack_name,
 		  const char *final_index_name, const char *curr_index_name,
 		  const char *keep_msg, const char *promisor_msg,
-		  unsigned char *sha1)
+		  unsigned char *hash)
 {
 	const char *report = "pack";
 	struct strbuf pack_name = STRBUF_INIT;
@@ -1456,15 +1457,15 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 	}
 
 	if (keep_msg)
-		write_special_file("keep", keep_msg, final_pack_name, sha1,
+		write_special_file("keep", keep_msg, final_pack_name, hash,
 				   &report);
 	if (promisor_msg)
 		write_special_file("promisor", promisor_msg, final_pack_name,
-				   sha1, NULL);
+				   hash, NULL);
 
 	if (final_pack_name != curr_pack_name) {
 		if (!final_pack_name)
-			final_pack_name = odb_pack_name(&pack_name, sha1, "pack");
+			final_pack_name = odb_pack_name(&pack_name, hash, "pack");
 		if (finalize_object_file(curr_pack_name, final_pack_name))
 			die(_("cannot store pack file"));
 	} else if (from_stdin)
@@ -1472,18 +1473,18 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 
 	if (final_index_name != curr_index_name) {
 		if (!final_index_name)
-			final_index_name = odb_pack_name(&index_name, sha1, "idx");
+			final_index_name = odb_pack_name(&index_name, hash, "idx");
 		if (finalize_object_file(curr_index_name, final_index_name))
 			die(_("cannot store index file"));
 	} else
 		chmod(final_index_name, 0444);
 
 	if (!from_stdin) {
-		printf("%s\n", sha1_to_hex(sha1));
+		printf("%s\n", sha1_to_hex(hash));
 	} else {
 		struct strbuf buf = STRBUF_INIT;
 
-		strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(sha1));
+		strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash));
 		write_or_die(1, buf.buf, buf.len);
 		strbuf_release(&buf);
 
@@ -1617,7 +1618,7 @@ static void show_pack_info(int stat_only)
 			continue;
 		printf("%s %-6s %lu %lu %"PRIuMAX,
 		       oid_to_hex(&obj->idx.oid),
-		       typename(obj->real_type), obj->size,
+		       type_name(obj->real_type), obj->size,
 		       (unsigned long)(obj[1].idx.offset - obj->idx.offset),
 		       (uintmax_t)obj->idx.offset);
 		if (is_delta_type(obj->type)) {
@@ -1654,7 +1655,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	struct strbuf index_name_buf = STRBUF_INIT;
 	struct pack_idx_entry **idx_objects;
 	struct pack_idx_option opts;
-	unsigned char pack_sha1[20];
+	unsigned char pack_hash[GIT_MAX_RAWSZ];
 	unsigned foreign_nr = 1;	/* zero is a "good" value, assume bad */
 	int report_end_of_input = 0;
 
@@ -1690,6 +1691,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 			} else if (!strcmp(arg, "--check-self-contained-and-connected")) {
 				strict = 1;
 				check_self_contained_and_connected = 1;
+			} else if (!strcmp(arg, "--fsck-objects")) {
+				do_fsck_object = 1;
 			} else if (!strcmp(arg, "--verify")) {
 				verify = 1;
 			} else if (!strcmp(arg, "--verify-stat")) {
@@ -1791,11 +1794,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	if (show_stat)
 		obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
 	ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
-	parse_pack_objects(pack_sha1);
+	parse_pack_objects(pack_hash);
 	if (report_end_of_input)
 		write_in_full(2, "\0", 1);
 	resolve_deltas();
-	conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
+	conclude_pack(fix_thin_pack, curr_pack, pack_hash);
 	free(ofs_deltas);
 	free(ref_deltas);
 	if (strict)
@@ -1807,14 +1810,14 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	ALLOC_ARRAY(idx_objects, nr_objects);
 	for (i = 0; i < nr_objects; i++)
 		idx_objects[i] = &objects[i].idx;
-	curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_sha1);
+	curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_hash);
 	free(idx_objects);
 
 	if (!verify)
 		final(pack_name, curr_pack,
 		      index_name, curr_index,
 		      keep_msg, promisor_msg,
-		      pack_sha1);
+		      pack_hash);
 	else
 		close(input_fd);
 	free(objects);
diff --git a/builtin/init-db.c b/builtin/init-db.c
index c9b7946..68ff4ad 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -24,11 +24,11 @@ static int init_is_bare_repository = 0;
 static int init_shared_repository = -1;
 static const char *init_db_template_dir;
 
-static void copy_templates_1(struct strbuf *path, struct strbuf *template,
+static void copy_templates_1(struct strbuf *path, struct strbuf *template_path,
 			     DIR *dir)
 {
 	size_t path_baselen = path->len;
-	size_t template_baselen = template->len;
+	size_t template_baselen = template_path->len;
 	struct dirent *de;
 
 	/* Note: if ".git/hooks" file exists in the repository being
@@ -44,12 +44,12 @@ static void copy_templates_1(struct strbuf *path, struct strbuf *template,
 		int exists = 0;
 
 		strbuf_setlen(path, path_baselen);
-		strbuf_setlen(template, template_baselen);
+		strbuf_setlen(template_path, template_baselen);
 
 		if (de->d_name[0] == '.')
 			continue;
 		strbuf_addstr(path, de->d_name);
-		strbuf_addstr(template, de->d_name);
+		strbuf_addstr(template_path, de->d_name);
 		if (lstat(path->buf, &st_git)) {
 			if (errno != ENOENT)
 				die_errno(_("cannot stat '%s'"), path->buf);
@@ -57,36 +57,36 @@ static void copy_templates_1(struct strbuf *path, struct strbuf *template,
 		else
 			exists = 1;
 
-		if (lstat(template->buf, &st_template))
-			die_errno(_("cannot stat template '%s'"), template->buf);
+		if (lstat(template_path->buf, &st_template))
+			die_errno(_("cannot stat template '%s'"), template_path->buf);
 
 		if (S_ISDIR(st_template.st_mode)) {
-			DIR *subdir = opendir(template->buf);
+			DIR *subdir = opendir(template_path->buf);
 			if (!subdir)
-				die_errno(_("cannot opendir '%s'"), template->buf);
+				die_errno(_("cannot opendir '%s'"), template_path->buf);
 			strbuf_addch(path, '/');
-			strbuf_addch(template, '/');
-			copy_templates_1(path, template, subdir);
+			strbuf_addch(template_path, '/');
+			copy_templates_1(path, template_path, subdir);
 			closedir(subdir);
 		}
 		else if (exists)
 			continue;
 		else if (S_ISLNK(st_template.st_mode)) {
 			struct strbuf lnk = STRBUF_INIT;
-			if (strbuf_readlink(&lnk, template->buf, 0) < 0)
-				die_errno(_("cannot readlink '%s'"), template->buf);
+			if (strbuf_readlink(&lnk, template_path->buf, 0) < 0)
+				die_errno(_("cannot readlink '%s'"), template_path->buf);
 			if (symlink(lnk.buf, path->buf))
 				die_errno(_("cannot symlink '%s' '%s'"),
 					  lnk.buf, path->buf);
 			strbuf_release(&lnk);
 		}
 		else if (S_ISREG(st_template.st_mode)) {
-			if (copy_file(path->buf, template->buf, st_template.st_mode))
+			if (copy_file(path->buf, template_path->buf, st_template.st_mode))
 				die_errno(_("cannot copy '%s' to '%s'"),
-					  template->buf, path->buf);
+					  template_path->buf, path->buf);
 		}
 		else
-			error(_("ignoring template %s"), template->buf);
+			error(_("ignoring template %s"), template_path->buf);
 	}
 }
 
diff --git a/builtin/log.c b/builtin/log.c
index 46b4ca1..71f68a3 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -29,6 +29,8 @@
 #include "gpg-interface.h"
 #include "progress.h"
 
+#define MAIL_DEFAULT_WRAP 72
+
 /* Set a default date-time format for git log ("log.date" config variable) */
 static const char *default_date_mode = NULL;
 
@@ -516,7 +518,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
 {
 	unsigned long size;
 	enum object_type type;
-	char *buf = read_sha1_file(oid->hash, &type, &size);
+	char *buf = read_object_file(oid, &type, &size);
 	int offset = 0;
 
 	if (!buf)
@@ -539,7 +541,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
 	return 0;
 }
 
-static int show_tree_object(const unsigned char *sha1,
+static int show_tree_object(const struct object_id *oid,
 		struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
@@ -1044,7 +1046,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
 	shortlog_init(&log);
 	log.wrap_lines = 1;
-	log.wrap = 72;
+	log.wrap = MAIL_DEFAULT_WRAP;
 	log.in1 = 2;
 	log.in2 = 4;
 	log.file = rev->diffopt.file;
@@ -1061,6 +1063,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
 	memcpy(&opts, &rev->diffopt, sizeof(opts));
 	opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
+	opts.stat_width = MAIL_DEFAULT_WRAP;
 
 	diff_setup_done(&opts);
 
@@ -1614,6 +1617,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		(!rev.diffopt.output_format ||
 		 rev.diffopt.output_format == DIFF_FORMAT_PATCH))
 		rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
+	if (!rev.diffopt.stat_width)
+		rev.diffopt.stat_width = MAIL_DEFAULT_WRAP;
 
 	/* Always generate a patch */
 	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
@@ -1868,12 +1873,12 @@ static void print_commit(char sign, struct commit *commit, int verbose,
 {
 	if (!verbose) {
 		fprintf(file, "%c %s\n", sign,
-		       find_unique_abbrev(commit->object.oid.hash, abbrev));
+		       find_unique_abbrev(&commit->object.oid, abbrev));
 	} else {
 		struct strbuf buf = STRBUF_INIT;
 		pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
 		fprintf(file, "%c %s %s\n", sign,
-		       find_unique_abbrev(commit->object.oid.hash, abbrev),
+		       find_unique_abbrev(&commit->object.oid, abbrev),
 		       buf.buf);
 		strbuf_release(&buf);
 	}
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 2fc836e..a71f6bd 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -240,7 +240,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
 			printf("%s%06o %s %d\t",
 			       tag,
 			       ce->ce_mode,
-			       find_unique_abbrev(ce->oid.hash, abbrev),
+			       find_unique_abbrev(&ce->oid, abbrev),
 			       ce_stage(ce));
 		}
 		write_eolinfo(repo->index, ce, fullname);
@@ -271,7 +271,7 @@ static void show_ru_info(const struct index_state *istate)
 			if (!ui->mode[i])
 				continue;
 			printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
-			       find_unique_abbrev(ui->sha1[i], abbrev),
+			       find_unique_abbrev(&ui->oid[i], abbrev),
 			       i + 1);
 			write_name(path);
 		}
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index c4be98a..540d564 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -60,8 +60,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
 		OPT_BOOL(0, "get-url", &get_url,
 			 N_("take url.<base>.insteadOf into account")),
-		OPT_SET_INT(0, "exit-code", &status,
-			    N_("exit with exit code 2 if no matching refs are found"), 2),
+		OPT_SET_INT_F(0, "exit-code", &status,
+			      N_("exit with exit code 2 if no matching refs are found"),
+			      2, PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL(0, "symref", &show_symref_target,
 			 N_("show underlying ref in addition to the object pointed by it")),
 		OPT_END()
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index ef96540..d44b4f9 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -60,7 +60,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
 	return 0;
 }
 
-static int show_tree(const unsigned char *sha1, struct strbuf *base,
+static int show_tree(const struct object_id *oid, struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
 	int retval = 0;
@@ -94,7 +94,7 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
 			char size_text[24];
 			if (!strcmp(type, blob_type)) {
 				unsigned long size;
-				if (sha1_object_info(sha1, &size) == OBJ_BAD)
+				if (oid_object_info(oid, &size) == OBJ_BAD)
 					xsnprintf(size_text, sizeof(size_text),
 						  "BAD");
 				else
@@ -103,11 +103,11 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
 			} else
 				xsnprintf(size_text, sizeof(size_text), "-");
 			printf("%06o %s %s %7s\t", mode, type,
-			       find_unique_abbrev(sha1, abbrev),
+			       find_unique_abbrev(oid, abbrev),
 			       size_text);
 		} else
 			printf("%06o %s %s\t", mode, type,
-			       find_unique_abbrev(sha1, abbrev));
+			       find_unique_abbrev(oid, abbrev));
 	}
 	baselen = base->len;
 	strbuf_addstr(base, pathname);
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index d01ddec..32736e0 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -60,7 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
 	const char *path = entry->path;
 
 	if (!entry->stage)
-		return read_sha1_file(entry->blob->object.oid.hash, &type, size);
+		return read_object_file(&entry->blob->object.oid, &type, size);
 	base = NULL;
 	if (entry->stage == 1) {
 		base = entry->blob;
@@ -82,7 +82,8 @@ static void *origin(struct merge_list *entry, unsigned long *size)
 	enum object_type type;
 	while (entry) {
 		if (entry->stage == 2)
-			return read_sha1_file(entry->blob->object.oid.hash, &type, size);
+			return read_object_file(&entry->blob->object.oid,
+						&type, size);
 		entry = entry->link;
 	}
 	return NULL;
diff --git a/builtin/merge.c b/builtin/merge.c
index 96d56cb..9db5a2c 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -33,6 +33,7 @@
 #include "sequencer.h"
 #include "string-list.h"
 #include "packfile.h"
+#include "tag.h"
 
 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)
@@ -520,7 +521,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 		if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
 			strbuf_addf(msg, "%s\t\t%s '%s'\n",
 				    oid_to_hex(&desc->obj->oid),
-				    typename(desc->obj->type),
+				    type_name(desc->obj->type),
 				    remote);
 			goto cleanup;
 		}
@@ -638,7 +639,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
 
 static void write_tree_trivial(struct object_id *oid)
 {
-	if (write_cache_as_tree(oid->hash, 0, NULL))
+	if (write_cache_as_tree(oid, 0, NULL))
 		die(_("git write-tree failed to write a tree"));
 }
 
@@ -651,10 +652,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 
 	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
 	refresh_cache(REFRESH_QUIET);
-	if (active_cache_changed &&
-	    write_locked_index(&the_index, &lock, COMMIT_LOCK))
+	if (write_locked_index(&the_index, &lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		return error(_("Unable to write index."));
-	rollback_lock_file(&lock);
 
 	if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
 		int clean, x;
@@ -691,10 +691,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 				remoteheads->item, reversed, &result);
 		if (clean < 0)
 			exit(128);
-		if (active_cache_changed &&
-		    write_locked_index(&the_index, &lock, COMMIT_LOCK))
+		if (write_locked_index(&the_index, &lock,
+				       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 			die (_("unable to write %s"), get_index_file());
-		rollback_lock_file(&lock);
 		return clean ? 0 : 1;
 	} else {
 		return try_merge_command(strategy, xopts_nr, xopts,
@@ -810,18 +809,17 @@ static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
 
 	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
 	refresh_cache(REFRESH_QUIET);
-	if (active_cache_changed &&
-	    write_locked_index(&the_index, &lock, COMMIT_LOCK))
+	if (write_locked_index(&the_index, &lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		return error(_("Unable to write index."));
-	rollback_lock_file(&lock);
 
 	write_tree_trivial(&result_tree);
 	printf(_("Wonderful.\n"));
 	pptr = commit_list_append(head, pptr);
 	pptr = commit_list_append(remoteheads->item, pptr);
 	prepare_to_commit(remoteheads);
-	if (commit_tree(merge_msg.buf, merge_msg.len, result_tree.hash, parents,
-			result_commit.hash, NULL, sign_commit))
+	if (commit_tree(merge_msg.buf, merge_msg.len, &result_tree, parents,
+			&result_commit, NULL, sign_commit))
 		die(_("failed to write commit object"));
 	finish(head, remoteheads, &result_commit, "In-index merge");
 	drop_save();
@@ -845,8 +843,8 @@ static int finish_automerge(struct commit *head,
 		commit_list_insert(head, &parents);
 	strbuf_addch(&merge_msg, '\n');
 	prepare_to_commit(remoteheads);
-	if (commit_tree(merge_msg.buf, merge_msg.len, result_tree->hash, parents,
-			result_commit.hash, NULL, sign_commit))
+	if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents,
+			&result_commit, NULL, sign_commit))
 		die(_("failed to write commit object"));
 	strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
 	finish(head, remoteheads, &result_commit, buf.buf);
@@ -1125,6 +1123,43 @@ static struct commit_list *collect_parents(struct commit *head_commit,
 	return remoteheads;
 }
 
+static int merging_a_throwaway_tag(struct commit *commit)
+{
+	char *tag_ref;
+	struct object_id oid;
+	int is_throwaway_tag = 0;
+
+	/* Are we merging a tag? */
+	if (!merge_remote_util(commit) ||
+	    !merge_remote_util(commit)->obj ||
+	    merge_remote_util(commit)->obj->type != OBJ_TAG)
+		return is_throwaway_tag;
+
+	/*
+	 * Now we know we are merging a tag object.  Are we downstream
+	 * and following the tags from upstream?  If so, we must have
+	 * the tag object pointed at by "refs/tags/$T" where $T is the
+	 * tagname recorded in the tag object.  We want to allow such
+	 * a "just to catch up" merge to fast-forward.
+	 *
+	 * Otherwise, we are playing an integrator's role, making a
+	 * merge with a throw-away tag from a contributor with
+	 * something like "git pull $contributor $signed_tag".
+	 * We want to forbid such a merge from fast-forwarding
+	 * by default; otherwise we would not keep the signature
+	 * anywhere.
+	 */
+	tag_ref = xstrfmt("refs/tags/%s",
+			  ((struct tag *)merge_remote_util(commit)->obj)->tag);
+	if (!read_ref(tag_ref, &oid) &&
+	    !oidcmp(&oid, &merge_remote_util(commit)->obj->oid))
+		is_throwaway_tag = 0;
+	else
+		is_throwaway_tag = 1;
+	free(tag_ref);
+	return is_throwaway_tag;
+}
+
 int cmd_merge(int argc, const char **argv, const char *prefix)
 {
 	struct object_id result_tree, stash, head_oid;
@@ -1289,7 +1324,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 			check_commit_signature(commit, &signature_check);
 
-			find_unique_abbrev_r(hex, commit->object.oid.hash, DEFAULT_ABBREV);
+			find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
 			switch (signature_check.result) {
 			case 'G':
 				break;
@@ -1322,10 +1357,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			    oid_to_hex(&commit->object.oid));
 		setenv(buf.buf, merge_remote_util(commit)->name, 1);
 		strbuf_reset(&buf);
-		if (fast_forward != FF_ONLY &&
-		    merge_remote_util(commit) &&
-		    merge_remote_util(commit)->obj &&
-		    merge_remote_util(commit)->obj->type == OBJ_TAG)
+		if (fast_forward != FF_ONLY && merging_a_throwaway_tag(commit))
 			fast_forward = FF_NO;
 	}
 
@@ -1385,9 +1417,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 		if (verbosity >= 0) {
 			printf(_("Updating %s..%s\n"),
-			       find_unique_abbrev(head_commit->object.oid.hash,
+			       find_unique_abbrev(&head_commit->object.oid,
 						  DEFAULT_ABBREV),
-			       find_unique_abbrev(remoteheads->item->object.oid.hash,
+			       find_unique_abbrev(&remoteheads->item->object.oid,
 						  DEFAULT_ABBREV));
 		}
 		strbuf_addstr(&msg, "Fast-forward");
diff --git a/builtin/mktag.c b/builtin/mktag.c
index 031b750..9f5a50a 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -18,17 +18,17 @@
 /*
  * We refuse to tag something we can't verify. Just because.
  */
-static int verify_object(const unsigned char *sha1, const char *expected_type)
+static int verify_object(const struct object_id *oid, const char *expected_type)
 {
 	int ret = -1;
 	enum object_type type;
 	unsigned long size;
-	void *buffer = read_sha1_file(sha1, &type, &size);
-	const unsigned char *repl = lookup_replace_object(sha1);
+	void *buffer = read_object_file(oid, &type, &size);
+	const struct object_id *repl = lookup_replace_object(oid);
 
 	if (buffer) {
 		if (type == type_from_string(expected_type))
-			ret = check_sha1_signature(repl, buffer, size, expected_type);
+			ret = check_object_signature(repl, buffer, size, expected_type);
 		free(buffer);
 	}
 	return ret;
@@ -38,8 +38,8 @@ static int verify_tag(char *buffer, unsigned long size)
 {
 	int typelen;
 	char type[20];
-	unsigned char sha1[20];
-	const char *object, *type_line, *tag_line, *tagger_line, *lb, *rb;
+	struct object_id oid;
+	const char *object, *type_line, *tag_line, *tagger_line, *lb, *rb, *p;
 	size_t len;
 
 	if (size < 84)
@@ -52,11 +52,11 @@ static int verify_tag(char *buffer, unsigned long size)
 	if (memcmp(object, "object ", 7))
 		return error("char%d: does not start with \"object \"", 0);
 
-	if (get_sha1_hex(object + 7, sha1))
+	if (parse_oid_hex(object + 7, &oid, &p))
 		return error("char%d: could not get SHA1 hash", 7);
 
 	/* Verify type line */
-	type_line = object + 48;
+	type_line = p + 1;
 	if (memcmp(type_line - 1, "\ntype ", 6))
 		return error("char%d: could not find \"\\ntype \"", 47);
 
@@ -80,8 +80,8 @@ static int verify_tag(char *buffer, unsigned long size)
 	type[typelen] = 0;
 
 	/* Verify that the object matches */
-	if (verify_object(sha1, type))
-		return error("char%d: could not verify object %s", 7, sha1_to_hex(sha1));
+	if (verify_object(&oid, type))
+		return error("char%d: could not verify object %s", 7, oid_to_hex(&oid));
 
 	/* Verify the tag-name: we don't allow control characters or spaces in it */
 	tag_line += 4;
@@ -151,7 +151,7 @@ static int verify_tag(char *buffer, unsigned long size)
 int cmd_mktag(int argc, const char **argv, const char *prefix)
 {
 	struct strbuf buf = STRBUF_INIT;
-	unsigned char result_sha1[20];
+	struct object_id result;
 
 	if (argc != 1)
 		usage("git mktag");
@@ -165,10 +165,10 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
 	if (verify_tag(buf.buf, buf.len) < 0)
 		die("invalid tag signature file");
 
-	if (write_sha1_file(buf.buf, buf.len, tag_type, result_sha1) < 0)
+	if (write_object_file(buf.buf, buf.len, tag_type, &result) < 0)
 		die("unable to write tag file");
 
 	strbuf_release(&buf);
-	printf("%s\n", sha1_to_hex(result_sha1));
+	printf("%s\n", oid_to_hex(&result));
 	return 0;
 }
diff --git a/builtin/mktree.c b/builtin/mktree.c
index da0fd8c..263c530 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -10,13 +10,13 @@
 
 static struct treeent {
 	unsigned mode;
-	unsigned char sha1[20];
+	struct object_id oid;
 	int len;
 	char name[FLEX_ARRAY];
 } **entries;
 static int alloc, used;
 
-static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
+static void append_to_tree(unsigned mode, struct object_id *oid, char *path)
 {
 	struct treeent *ent;
 	size_t len = strlen(path);
@@ -26,7 +26,7 @@ static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
 	FLEX_ALLOC_MEM(ent, name, path, len);
 	ent->mode = mode;
 	ent->len = len;
-	hashcpy(ent->sha1, sha1);
+	oidcpy(&ent->oid, oid);
 
 	ALLOC_GROW(entries, used + 1, alloc);
 	entries[used++] = ent;
@@ -40,7 +40,7 @@ static int ent_compare(const void *a_, const void *b_)
 				 b->name, b->len, b->mode);
 }
 
-static void write_tree(unsigned char *sha1)
+static void write_tree(struct object_id *oid)
 {
 	struct strbuf buf;
 	size_t size;
@@ -54,10 +54,10 @@ static void write_tree(unsigned char *sha1)
 	for (i = 0; i < used; i++) {
 		struct treeent *ent = entries[i];
 		strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
-		strbuf_add(&buf, ent->sha1, 20);
+		strbuf_add(&buf, ent->oid.hash, the_hash_algo->rawsz);
 	}
 
-	write_sha1_file(buf.buf, buf.len, tree_type, sha1);
+	write_object_file(buf.buf, buf.len, tree_type, oid);
 	strbuf_release(&buf);
 }
 
@@ -69,11 +69,12 @@ static const char *mktree_usage[] = {
 static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_missing)
 {
 	char *ptr, *ntr;
+	const char *p;
 	unsigned mode;
 	enum object_type mode_type; /* object type derived from mode */
 	enum object_type obj_type; /* object type derived from sha */
 	char *path, *to_free = NULL;
-	unsigned char sha1[20];
+	struct object_id oid;
 
 	ptr = buf;
 	/*
@@ -85,9 +86,8 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
 		die("input format error: %s", buf);
 	ptr = ntr + 1; /* type */
 	ntr = strchr(ptr, ' ');
-	if (!ntr || buf + len <= ntr + 40 ||
-	    ntr[41] != '\t' ||
-	    get_sha1_hex(ntr + 1, sha1))
+	if (!ntr || parse_oid_hex(ntr + 1, &oid, &p) ||
+	    *p != '\t')
 		die("input format error: %s", buf);
 
 	/* It is perfectly normal if we do not have a commit from a submodule */
@@ -112,16 +112,16 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
 	mode_type = object_type(mode);
 	if (mode_type != type_from_string(ptr)) {
 		die("entry '%s' object type (%s) doesn't match mode type (%s)",
-			path, ptr, typename(mode_type));
+			path, ptr, type_name(mode_type));
 	}
 
 	/* Check the type of object identified by sha1 */
-	obj_type = sha1_object_info(sha1, NULL);
+	obj_type = oid_object_info(&oid, NULL);
 	if (obj_type < 0) {
 		if (allow_missing) {
 			; /* no problem - missing objects are presumed to be of the right type */
 		} else {
-			die("entry '%s' object %s is unavailable", path, sha1_to_hex(sha1));
+			die("entry '%s' object %s is unavailable", path, oid_to_hex(&oid));
 		}
 	} else {
 		if (obj_type != mode_type) {
@@ -131,18 +131,18 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
 			 * because the new tree entry will never be correct.
 			 */
 			die("entry '%s' object %s is a %s but specified type was (%s)",
-				path, sha1_to_hex(sha1), typename(obj_type), typename(mode_type));
+				path, oid_to_hex(&oid), type_name(obj_type), type_name(mode_type));
 		}
 	}
 
-	append_to_tree(mode, sha1, path);
+	append_to_tree(mode, &oid, path);
 	free(to_free);
 }
 
 int cmd_mktree(int ac, const char **av, const char *prefix)
 {
 	struct strbuf sb = STRBUF_INIT;
-	unsigned char sha1[20];
+	struct object_id oid;
 	int nul_term_line = 0;
 	int allow_missing = 0;
 	int is_batch_mode = 0;
@@ -181,8 +181,8 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
 			 */
 			; /* skip creating an empty tree */
 		} else {
-			write_tree(sha1);
-			puts(sha1_to_hex(sha1));
+			write_tree(&oid);
+			puts(oid_to_hex(&oid));
 			fflush(stdout);
 		}
 		used=0; /* reset tree entry buffer for re-use in batch mode */
diff --git a/builtin/mv.c b/builtin/mv.c
index cf3684d..6d141f7 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -122,7 +122,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	struct option builtin_mv_options[] = {
 		OPT__VERBOSE(&verbose, N_("be verbose")),
 		OPT__DRY_RUN(&show_only, N_("dry run")),
-		OPT__FORCE(&force, N_("force move/rename even if target exists")),
+		OPT__FORCE(&force, N_("force move/rename even if target exists"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
 		OPT_END(),
 	};
@@ -286,15 +287,14 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 
 		pos = cache_name_pos(src, strlen(src));
 		assert(pos >= 0);
-		if (!show_only)
-			rename_cache_entry_at(pos, dst);
+		rename_cache_entry_at(pos, dst);
 	}
 
 	if (gitmodules_modified)
 		stage_updated_gitmodules(&the_index);
 
-	if (active_cache_changed &&
-	    write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+	if (write_locked_index(&the_index, &lock_file,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		die(_("Unable to write new index file"));
 
 	return 0;
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 9e088eb..387ddf8 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -328,7 +328,7 @@ static void show_name(const struct object *obj,
 	else if (allow_undefined)
 		printf("undefined\n");
 	else if (always)
-		printf("%s\n", find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+		printf("%s\n", find_unique_abbrev(oid, DEFAULT_ABBREV));
 	else
 		die("cannot describe '%s'", oid_to_hex(oid));
 	strbuf_release(&buf);
diff --git a/builtin/notes.c b/builtin/notes.c
index 7c81761..921e08d 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -118,11 +118,11 @@ static int list_each_note(const struct object_id *object_oid,
 	return 0;
 }
 
-static void copy_obj_to_fd(int fd, const unsigned char *sha1)
+static void copy_obj_to_fd(int fd, const struct object_id *oid)
 {
 	unsigned long size;
 	enum object_type type;
-	char *buf = read_sha1_file(sha1, &type, &size);
+	char *buf = read_object_file(oid, &type, &size);
 	if (buf) {
 		if (size)
 			write_or_die(fd, buf, size);
@@ -162,7 +162,7 @@ static void write_commented_object(int fd, const struct object_id *object)
 }
 
 static void prepare_note_data(const struct object_id *object, struct note_data *d,
-		const unsigned char *old_note)
+		const struct object_id *old_note)
 {
 	if (d->use_editor || !d->given) {
 		int fd;
@@ -198,9 +198,9 @@ static void prepare_note_data(const struct object_id *object, struct note_data *
 	}
 }
 
-static void write_note_data(struct note_data *d, unsigned char *sha1)
+static void write_note_data(struct note_data *d, struct object_id *oid)
 {
-	if (write_sha1_file(d->buf.buf, d->buf.len, blob_type, sha1)) {
+	if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) {
 		error(_("unable to write note object"));
 		if (d->edit_path)
 			error(_("the note contents have been left in %s"),
@@ -253,7 +253,7 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
 
 	if (get_oid(arg, &object))
 		die(_("failed to resolve '%s' as a valid ref."), arg);
-	if (!(buf = read_sha1_file(object.hash, &type, &len))) {
+	if (!(buf = read_object_file(&object, &type, &len))) {
 		free(buf);
 		die(_("failed to read object '%s'."), arg);
 	}
@@ -413,7 +413,7 @@ static int add(int argc, const char **argv, const char *prefix)
 			parse_reuse_arg},
 		OPT_BOOL(0, "allow-empty", &allow_empty,
 			N_("allow storing empty note")),
-		OPT__FORCE(&force, N_("replace existing notes")),
+		OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
 		OPT_END()
 	};
 
@@ -457,9 +457,9 @@ static int add(int argc, const char **argv, const char *prefix)
 			oid_to_hex(&object));
 	}
 
-	prepare_note_data(&object, &d, note ? note->hash : NULL);
+	prepare_note_data(&object, &d, note);
 	if (d.buf.len || allow_empty) {
-		write_note_data(&d, new_note.hash);
+		write_note_data(&d, &new_note);
 		if (add_note(t, &object, &new_note, combine_notes_overwrite))
 			die("BUG: combine_notes_overwrite failed");
 		commit_notes(t, "Notes added by 'git notes add'");
@@ -484,7 +484,7 @@ static int copy(int argc, const char **argv, const char *prefix)
 	struct notes_tree *t;
 	const char *rewrite_cmd = NULL;
 	struct option options[] = {
-		OPT__FORCE(&force, N_("replace existing notes")),
+		OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL(0, "stdin", &from_stdin, N_("read objects from stdin")),
 		OPT_STRING(0, "for-rewrite", &rewrite_cmd, N_("command"),
 			   N_("load rewriting config for <command> (implies "
@@ -602,13 +602,13 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 	t = init_notes_check(argv[0], NOTES_INIT_WRITABLE);
 	note = get_note(t, &object);
 
-	prepare_note_data(&object, &d, edit && note ? note->hash : NULL);
+	prepare_note_data(&object, &d, edit && note ? note : NULL);
 
 	if (note && !edit) {
 		/* Append buf to previous note contents */
 		unsigned long size;
 		enum object_type type;
-		char *prev_buf = read_sha1_file(note->hash, &type, &size);
+		char *prev_buf = read_object_file(note, &type, &size);
 
 		strbuf_grow(&d.buf, size + 1);
 		if (d.buf.len && prev_buf && size)
@@ -619,7 +619,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 	}
 
 	if (d.buf.len || allow_empty) {
-		write_note_data(&d, new_note.hash);
+		write_note_data(&d, &new_note);
 		if (add_note(t, &object, &new_note, combine_notes_overwrite))
 			die("BUG: combine_notes_overwrite failed");
 		logmsg = xstrfmt("Notes added by 'git notes %s'", argv[0]);
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 223f2d9..89f49bb 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -124,11 +124,10 @@ static void *get_delta(struct object_entry *entry)
 	void *buf, *base_buf, *delta_buf;
 	enum object_type type;
 
-	buf = read_sha1_file(entry->idx.oid.hash, &type, &size);
+	buf = read_object_file(&entry->idx.oid, &type, &size);
 	if (!buf)
 		die("unable to read %s", oid_to_hex(&entry->idx.oid));
-	base_buf = read_sha1_file(entry->delta->idx.oid.hash, &type,
-				  &base_size);
+	base_buf = read_object_file(&entry->delta->idx.oid, &type, &base_size);
 	if (!base_buf)
 		die("unable to read %s",
 		    oid_to_hex(&entry->delta->idx.oid));
@@ -166,7 +165,7 @@ static unsigned long do_compress(void **pptr, unsigned long size)
 	return stream.total_out;
 }
 
-static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
+static unsigned long write_large_blob_data(struct git_istream *st, struct hashfile *f,
 					   const struct object_id *oid)
 {
 	git_zstream stream;
@@ -190,7 +189,7 @@ static unsigned long write_large_blob_data(struct git_istream *st, struct sha1fi
 			stream.next_out = obuf;
 			stream.avail_out = sizeof(obuf);
 			zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
-			sha1write(f, obuf, stream.next_out - obuf);
+			hashwrite(f, obuf, stream.next_out - obuf);
 			olen += stream.next_out - obuf;
 		}
 		if (stream.avail_in)
@@ -235,7 +234,7 @@ static int check_pack_inflate(struct packed_git *p,
 		stream.total_in == len) ? 0 : -1;
 }
 
-static void copy_pack_data(struct sha1file *f,
+static void copy_pack_data(struct hashfile *f,
 		struct packed_git *p,
 		struct pack_window **w_curs,
 		off_t offset,
@@ -248,14 +247,14 @@ static void copy_pack_data(struct sha1file *f,
 		in = use_pack(p, w_curs, offset, &avail);
 		if (avail > len)
 			avail = (unsigned long)len;
-		sha1write(f, in, avail);
+		hashwrite(f, in, avail);
 		offset += avail;
 		len -= avail;
 	}
 }
 
 /* Return 0 if we will bust the pack-size limit */
-static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry,
+static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
 					   unsigned long limit, int usable_delta)
 {
 	unsigned long size, datalen;
@@ -269,11 +268,10 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
 	if (!usable_delta) {
 		if (entry->type == OBJ_BLOB &&
 		    entry->size > big_file_threshold &&
-		    (st = open_istream(entry->idx.oid.hash, &type, &size, NULL)) != NULL)
+		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
 			buf = NULL;
 		else {
-			buf = read_sha1_file(entry->idx.oid.hash, &type,
-					     &size);
+			buf = read_object_file(&entry->idx.oid, &type, &size);
 			if (!buf)
 				die(_("unable to read %s"),
 				    oid_to_hex(&entry->idx.oid));
@@ -328,8 +326,8 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
 			free(buf);
 			return 0;
 		}
-		sha1write(f, header, hdrlen);
-		sha1write(f, dheader + pos, sizeof(dheader) - pos);
+		hashwrite(f, header, hdrlen);
+		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
 		hdrlen += sizeof(dheader) - pos;
 	} else if (type == OBJ_REF_DELTA) {
 		/*
@@ -342,8 +340,8 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
 			free(buf);
 			return 0;
 		}
-		sha1write(f, header, hdrlen);
-		sha1write(f, entry->delta->idx.oid.hash, 20);
+		hashwrite(f, header, hdrlen);
+		hashwrite(f, entry->delta->idx.oid.hash, 20);
 		hdrlen += 20;
 	} else {
 		if (limit && hdrlen + datalen + 20 >= limit) {
@@ -352,13 +350,13 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
 			free(buf);
 			return 0;
 		}
-		sha1write(f, header, hdrlen);
+		hashwrite(f, header, hdrlen);
 	}
 	if (st) {
 		datalen = write_large_blob_data(st, f, &entry->idx.oid);
 		close_istream(st);
 	} else {
-		sha1write(f, buf, datalen);
+		hashwrite(f, buf, datalen);
 		free(buf);
 	}
 
@@ -366,7 +364,7 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
 }
 
 /* Return 0 if we will bust the pack-size limit */
-static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry,
+static off_t write_reuse_object(struct hashfile *f, struct object_entry *entry,
 				unsigned long limit, int usable_delta)
 {
 	struct packed_git *p = entry->in_pack;
@@ -417,8 +415,8 @@ static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry,
 			unuse_pack(&w_curs);
 			return 0;
 		}
-		sha1write(f, header, hdrlen);
-		sha1write(f, dheader + pos, sizeof(dheader) - pos);
+		hashwrite(f, header, hdrlen);
+		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
 		hdrlen += sizeof(dheader) - pos;
 		reused_delta++;
 	} else if (type == OBJ_REF_DELTA) {
@@ -426,8 +424,8 @@ static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry,
 			unuse_pack(&w_curs);
 			return 0;
 		}
-		sha1write(f, header, hdrlen);
-		sha1write(f, entry->delta->idx.oid.hash, 20);
+		hashwrite(f, header, hdrlen);
+		hashwrite(f, entry->delta->idx.oid.hash, 20);
 		hdrlen += 20;
 		reused_delta++;
 	} else {
@@ -435,7 +433,7 @@ static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry,
 			unuse_pack(&w_curs);
 			return 0;
 		}
-		sha1write(f, header, hdrlen);
+		hashwrite(f, header, hdrlen);
 	}
 	copy_pack_data(f, p, &w_curs, offset, datalen);
 	unuse_pack(&w_curs);
@@ -444,7 +442,7 @@ static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry,
 }
 
 /* Return 0 if we will bust the pack-size limit */
-static off_t write_object(struct sha1file *f,
+static off_t write_object(struct hashfile *f,
 			  struct object_entry *entry,
 			  off_t write_offset)
 {
@@ -517,7 +515,7 @@ enum write_one_status {
 	WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
 };
 
-static enum write_one_status write_one(struct sha1file *f,
+static enum write_one_status write_one(struct hashfile *f,
 				       struct object_entry *e,
 				       off_t *offset)
 {
@@ -736,7 +734,7 @@ static struct object_entry **compute_write_order(void)
 	return wo;
 }
 
-static off_t write_reused_pack(struct sha1file *f)
+static off_t write_reused_pack(struct hashfile *f)
 {
 	unsigned char buffer[8192];
 	off_t to_write, total;
@@ -767,7 +765,7 @@ static off_t write_reused_pack(struct sha1file *f)
 		if (read_pack > to_write)
 			read_pack = to_write;
 
-		sha1write(f, buffer, read_pack);
+		hashwrite(f, buffer, read_pack);
 		to_write -= read_pack;
 
 		/*
@@ -796,7 +794,7 @@ static const char no_split_warning[] = N_(
 static void write_pack_file(void)
 {
 	uint32_t i = 0, j;
-	struct sha1file *f;
+	struct hashfile *f;
 	off_t offset;
 	uint32_t nr_remaining = nr_result;
 	time_t last_mtime = 0;
@@ -812,7 +810,7 @@ static void write_pack_file(void)
 		char *pack_tmp_name = NULL;
 
 		if (pack_to_stdout)
-			f = sha1fd_throughput(1, "<stdout>", progress_state);
+			f = hashfd_throughput(1, "<stdout>", progress_state);
 		else
 			f = create_tmp_packfile(&pack_tmp_name);
 
@@ -839,11 +837,11 @@ static void write_pack_file(void)
 		 * If so, rewrite it like in fast-import
 		 */
 		if (pack_to_stdout) {
-			sha1close(f, oid.hash, CSUM_CLOSE);
+			hashclose(f, oid.hash, CSUM_CLOSE);
 		} else if (nr_written == nr_remaining) {
-			sha1close(f, oid.hash, CSUM_FSYNC);
+			hashclose(f, oid.hash, CSUM_FSYNC);
 		} else {
-			int fd = sha1close(f, oid.hash, 0);
+			int fd = hashclose(f, oid.hash, 0);
 			fixup_pack_header_footer(fd, oid.hash, pack_tmp_name,
 						 nr_written, oid.hash, offset);
 			close(fd);
@@ -1192,7 +1190,7 @@ static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
 	/* Did not find one.  Either we got a bogus request or
 	 * we need to read and perhaps cache.
 	 */
-	data = read_sha1_file(oid->hash, &type, &size);
+	data = read_object_file(oid, &type, &size);
 	if (!data)
 		return NULL;
 	if (type != OBJ_TREE) {
@@ -1353,7 +1351,7 @@ static void add_preferred_base(struct object_id *oid)
 	if (window <= num_preferred_base++)
 		return;
 
-	data = read_object_with_reference(oid->hash, tree_type, &size, tree_oid.hash);
+	data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
 	if (!data)
 		return;
 
@@ -1381,10 +1379,10 @@ static void cleanup_preferred_base(void)
 	it = pbase_tree;
 	pbase_tree = NULL;
 	while (it) {
-		struct pbase_tree *this = it;
-		it = this->next;
-		free(this->pcache.tree_data);
-		free(this);
+		struct pbase_tree *tmp = it;
+		it = tmp->next;
+		free(tmp->pcache.tree_data);
+		free(tmp);
 	}
 
 	for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
@@ -1518,7 +1516,7 @@ static void check_object(struct object_entry *entry)
 		unuse_pack(&w_curs);
 	}
 
-	entry->type = sha1_object_info(entry->idx.oid.hash, &entry->size);
+	entry->type = oid_object_info(&entry->idx.oid, &entry->size);
 	/*
 	 * The error condition is checked in prepare_pack().  This is
 	 * to permit a missing preferred base object to be ignored
@@ -1580,8 +1578,7 @@ static void drop_reused_delta(struct object_entry *entry)
 		 * And if that fails, the error will be recorded in entry->type
 		 * and dealt with in prepare_pack().
 		 */
-		entry->type = sha1_object_info(entry->idx.oid.hash,
-					       &entry->size);
+		entry->type = oid_object_info(&entry->idx.oid, &entry->size);
 	}
 }
 
@@ -1873,8 +1870,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 	/* Load data if not already done */
 	if (!trg->data) {
 		read_lock();
-		trg->data = read_sha1_file(trg_entry->idx.oid.hash, &type,
-					   &sz);
+		trg->data = read_object_file(&trg_entry->idx.oid, &type, &sz);
 		read_unlock();
 		if (!trg->data)
 			die("object %s cannot be read",
@@ -1887,8 +1883,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 	}
 	if (!src->data) {
 		read_lock();
-		src->data = read_sha1_file(src_entry->idx.oid.hash, &type,
-					   &sz);
+		src->data = read_object_file(&src_entry->idx.oid, &type, &sz);
 		read_unlock();
 		if (!src->data) {
 			if (src_entry->preferred_base) {
@@ -2551,6 +2546,7 @@ static void read_object_list_from_stdin(void)
 	}
 }
 
+/* Remember to update object flag allocation in object.h */
 #define OBJECT_ADDED (1u<<20)
 
 static void show_commit(struct commit *commit, void *data)
@@ -2710,7 +2706,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
 static int add_loose_object(const struct object_id *oid, const char *path,
 			    void *data)
 {
-	enum object_type type = sha1_object_info(oid->hash, NULL);
+	enum object_type type = oid_object_info(oid, NULL);
 
 	if (type < 0) {
 		warning("loose object at %s could not be examined", path);
@@ -2796,7 +2792,7 @@ static void loosen_unused_packed_objects(struct rev_info *revs)
 			if (!packlist_find(&to_pack, oid.hash, NULL) &&
 			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
 			    !loosened_object_can_be_discarded(&oid, p->mtime))
-				if (force_object_loose(oid.hash, p->mtime))
+				if (force_object_loose(&oid, p->mtime))
 					die("unable to force loose object");
 		}
 	}
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index b5b007e..f060b94 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -50,17 +50,17 @@ static inline void llist_item_put(struct llist_item *item)
 
 static inline struct llist_item *llist_item_get(void)
 {
-	struct llist_item *new;
+	struct llist_item *new_item;
 	if ( free_nodes ) {
-		new = free_nodes;
+		new_item = free_nodes;
 		free_nodes = free_nodes->next;
 	} else {
 		int i = 1;
-		ALLOC_ARRAY(new, BLKSIZE);
+		ALLOC_ARRAY(new_item, BLKSIZE);
 		for (; i < BLKSIZE; i++)
-			llist_item_put(&new[i]);
+			llist_item_put(&new_item[i]);
 	}
-	return new;
+	return new_item;
 }
 
 static void llist_free(struct llist *list)
@@ -82,26 +82,26 @@ static inline void llist_init(struct llist **list)
 static struct llist * llist_copy(struct llist *list)
 {
 	struct llist *ret;
-	struct llist_item *new, *old, *prev;
+	struct llist_item *new_item, *old_item, *prev;
 
 	llist_init(&ret);
 
 	if ((ret->size = list->size) == 0)
 		return ret;
 
-	new = ret->front = llist_item_get();
-	new->sha1 = list->front->sha1;
+	new_item = ret->front = llist_item_get();
+	new_item->sha1 = list->front->sha1;
 
-	old = list->front->next;
-	while (old) {
-		prev = new;
-		new = llist_item_get();
-		prev->next = new;
-		new->sha1 = old->sha1;
-		old = old->next;
+	old_item = list->front->next;
+	while (old_item) {
+		prev = new_item;
+		new_item = llist_item_get();
+		prev->next = new_item;
+		new_item->sha1 = old_item->sha1;
+		old_item = old_item->next;
 	}
-	new->next = NULL;
-	ret->back = new;
+	new_item->next = NULL;
+	ret->back = new_item;
 
 	return ret;
 }
@@ -110,24 +110,24 @@ static inline struct llist_item *llist_insert(struct llist *list,
 					      struct llist_item *after,
 					       const unsigned char *sha1)
 {
-	struct llist_item *new = llist_item_get();
-	new->sha1 = sha1;
-	new->next = NULL;
+	struct llist_item *new_item = llist_item_get();
+	new_item->sha1 = sha1;
+	new_item->next = NULL;
 
 	if (after != NULL) {
-		new->next = after->next;
-		after->next = new;
+		new_item->next = after->next;
+		after->next = new_item;
 		if (after == list->back)
-			list->back = new;
+			list->back = new_item;
 	} else {/* insert in front */
 		if (list->size == 0)
-			list->back = new;
+			list->back = new_item;
 		else
-			new->next = list->front;
-		list->front = new;
+			new_item->next = list->front;
+		list->front = new_item;
 	}
 	list->size++;
-	return new;
+	return new_item;
 }
 
 static inline struct llist_item *llist_insert_back(struct llist *list,
diff --git a/builtin/prune.c b/builtin/prune.c
index 4cfec82..38ced18 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -50,9 +50,9 @@ static int prune_object(const struct object_id *oid, const char *fullpath,
 	if (st.st_mtime > expire)
 		return 0;
 	if (show_only || verbose) {
-		enum object_type type = sha1_object_info(oid->hash, NULL);
+		enum object_type type = oid_object_info(oid, NULL);
 		printf("%s %s\n", oid_to_hex(oid),
-		       (type > 0) ? typename(type) : "unknown");
+		       (type > 0) ? type_name(type) : "unknown");
 	}
 	if (!show_only)
 		unlink_or_warn(fullpath);
diff --git a/builtin/pull.c b/builtin/pull.c
index 511dbbe..e32d6cd 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -193,7 +193,7 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack, N_("path"),
 		N_("path to upload pack on remote end"),
 		0),
-	OPT__FORCE(&opt_force, N_("force overwrite of local branch")),
+	OPT__FORCE(&opt_force, N_("force overwrite of local branch"), 0),
 	OPT_PASSTHRU('t', "tags", &opt_tags, NULL,
 		N_("fetch all tags and associated objects"),
 		PARSE_OPT_NOARG),
@@ -574,6 +574,7 @@ static int rebase_submodules(void)
 	cp.no_stdin = 1;
 	argv_array_pushl(&cp.args, "submodule", "update",
 				   "--recursive", "--rebase", NULL);
+	argv_push_verbosity(&cp.args);
 
 	return run_command(&cp);
 }
@@ -586,6 +587,7 @@ static int update_submodules(void)
 	cp.no_stdin = 1;
 	argv_array_pushl(&cp.args, "submodule", "update",
 				   "--recursive", "--checkout", NULL);
+	argv_push_verbosity(&cp.args);
 
 	return run_command(&cp);
 }
diff --git a/builtin/push.c b/builtin/push.c
index 1c28427..013c20d 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -548,7 +548,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		{ OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "check|on-demand|no",
 			N_("control recursive pushing of submodules"),
 			PARSE_OPT_OPTARG, option_parse_recurse_submodules },
-		OPT_BOOL( 0 , "thin", &thin, N_("use thin pack")),
+		OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),
 		OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
 		OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")),
 		OPT_BIT('u', "set-upstream", &flags, N_("set upstream for git pull/status"),
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index 00faf14..ad07470 100644
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -22,6 +22,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
 	struct option options[] = {
 		OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
 		OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
+		OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
+			N_("allow commits with empty messages")),
 		OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
 				CONTINUE),
 		OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 1a298a6..19428ef 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -69,7 +69,7 @@ static int sent_capabilities;
 static int shallow_update;
 static const char *alt_shallow_file;
 static struct strbuf push_cert = STRBUF_INIT;
-static unsigned char push_cert_sha1[20];
+static struct object_id push_cert_oid;
 static struct signature_check sigcheck;
 static const char *push_cert_nonce;
 static const char *cert_nonce_seed;
@@ -633,8 +633,9 @@ static void prepare_push_cert_sha1(struct child_process *proc)
 		int bogs /* beginning_of_gpg_sig */;
 
 		already_done = 1;
-		if (write_sha1_file(push_cert.buf, push_cert.len, "blob", push_cert_sha1))
-			hashclr(push_cert_sha1);
+		if (write_object_file(push_cert.buf, push_cert.len, "blob",
+				      &push_cert_oid))
+			oidclr(&push_cert_oid);
 
 		memset(&sigcheck, '\0', sizeof(sigcheck));
 		sigcheck.result = 'N';
@@ -655,9 +656,9 @@ static void prepare_push_cert_sha1(struct child_process *proc)
 		strbuf_release(&gpg_status);
 		nonce_status = check_nonce(push_cert.buf, bogs);
 	}
-	if (!is_null_sha1(push_cert_sha1)) {
+	if (!is_null_oid(&push_cert_oid)) {
 		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT=%s",
-				 sha1_to_hex(push_cert_sha1));
+				 oid_to_hex(&push_cert_oid));
 		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s",
 				 sigcheck.signer ? sigcheck.signer : "");
 		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s",
@@ -1241,11 +1242,11 @@ static void check_aliased_update(struct command *cmd, struct string_list *list)
 	rp_error("refusing inconsistent update between symref '%s' (%s..%s) and"
 		 " its target '%s' (%s..%s)",
 		 cmd->ref_name,
-		 find_unique_abbrev(cmd->old_oid.hash, DEFAULT_ABBREV),
-		 find_unique_abbrev(cmd->new_oid.hash, DEFAULT_ABBREV),
+		 find_unique_abbrev(&cmd->old_oid, DEFAULT_ABBREV),
+		 find_unique_abbrev(&cmd->new_oid, DEFAULT_ABBREV),
 		 dst_cmd->ref_name,
-		 find_unique_abbrev(dst_cmd->old_oid.hash, DEFAULT_ABBREV),
-		 find_unique_abbrev(dst_cmd->new_oid.hash, DEFAULT_ABBREV));
+		 find_unique_abbrev(&dst_cmd->old_oid, DEFAULT_ABBREV),
+		 find_unique_abbrev(&dst_cmd->new_oid, DEFAULT_ABBREV));
 
 	cmd->error_string = dst_cmd->error_string =
 		"inconsistent aliased update";
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2233725..a89bd1d 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -52,6 +52,7 @@ struct collect_reflog_cb {
 	int nr;
 };
 
+/* Remember to update object flag allocation in object.h */
 #define INCOMPLETE	(1u<<10)
 #define STUDYING	(1u<<11)
 #define REACHABLE	(1u<<12)
@@ -74,7 +75,7 @@ static int tree_is_complete(const struct object_id *oid)
 	if (!tree->buffer) {
 		enum object_type type;
 		unsigned long size;
-		void *data = read_sha1_file(oid->hash, &type, &size);
+		void *data = read_object_file(oid, &type, &size);
 		if (!data) {
 			tree->object.flags |= INCOMPLETE;
 			return 0;
@@ -289,20 +290,20 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no
 				    const char *message, void *cb_data)
 {
 	struct expire_reflog_policy_cb *cb = cb_data;
-	struct commit *old, *new;
+	struct commit *old_commit, *new_commit;
 
 	if (timestamp < cb->cmd.expire_total)
 		return 1;
 
-	old = new = NULL;
+	old_commit = new_commit = NULL;
 	if (cb->cmd.stalefix &&
-	    (!keep_entry(&old, ooid) || !keep_entry(&new, noid)))
+	    (!keep_entry(&old_commit, ooid) || !keep_entry(&new_commit, noid)))
 		return 1;
 
 	if (timestamp < cb->cmd.expire_unreachable) {
 		if (cb->unreachable_expire_kind == UE_ALWAYS)
 			return 1;
-		if (unreachable(cb, old, ooid) || unreachable(cb, new, noid))
+		if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
 			return 1;
 	}
 
diff --git a/builtin/remote.c b/builtin/remote.c
index d95bf90..805ffc0 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -168,7 +168,7 @@ static int add(int argc, const char **argv)
 		OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")),
 		{ OPTION_CALLBACK, 0, "mirror", &mirror, N_("push|fetch"),
 			N_("set up remote as a mirror to push to or fetch from"),
-			PARSE_OPT_OPTARG, parse_mirror_opt },
+			PARSE_OPT_OPTARG | PARSE_OPT_COMP_ARG, parse_mirror_opt },
 		OPT_END()
 	};
 
@@ -322,7 +322,7 @@ static void read_branches(void)
 
 struct ref_states {
 	struct remote *remote;
-	struct string_list new, stale, tracked, heads, push;
+	struct string_list new_refs, stale, tracked, heads, push;
 	int queried;
 };
 
@@ -337,12 +337,12 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
 			die(_("Could not get fetch map for refspec %s"),
 				states->remote->fetch_refspec[i]);
 
-	states->new.strdup_strings = 1;
+	states->new_refs.strdup_strings = 1;
 	states->tracked.strdup_strings = 1;
 	states->stale.strdup_strings = 1;
 	for (ref = fetch_map; ref; ref = ref->next) {
 		if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
-			string_list_append(&states->new, abbrev_branch(ref->name));
+			string_list_append(&states->new_refs, abbrev_branch(ref->name));
 		else
 			string_list_append(&states->tracked, abbrev_branch(ref->name));
 	}
@@ -356,7 +356,7 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
 	free_refs(stale_refs);
 	free_refs(fetch_map);
 
-	string_list_sort(&states->new);
+	string_list_sort(&states->new_refs);
 	string_list_sort(&states->tracked);
 	string_list_sort(&states->stale);
 
@@ -546,8 +546,8 @@ static int add_branch_for_removal(const char *refname,
 }
 
 struct rename_info {
-	const char *old;
-	const char *new;
+	const char *old_name;
+	const char *new_name;
 	struct string_list *remote_branches;
 };
 
@@ -560,7 +560,7 @@ static int read_remote_branches(const char *refname,
 	int flag;
 	const char *symref;
 
-	strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
+	strbuf_addf(&buf, "refs/remotes/%s/", rename->old_name);
 	if (starts_with(refname, buf.buf)) {
 		item = string_list_append(rename->remote_branches, xstrdup(refname));
 		symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
@@ -615,36 +615,36 @@ static int mv(int argc, const char **argv)
 	if (argc != 3)
 		usage_with_options(builtin_remote_rename_usage, options);
 
-	rename.old = argv[1];
-	rename.new = argv[2];
+	rename.old_name = argv[1];
+	rename.new_name = argv[2];
 	rename.remote_branches = &remote_branches;
 
-	oldremote = remote_get(rename.old);
+	oldremote = remote_get(rename.old_name);
 	if (!remote_is_configured(oldremote, 1))
-		die(_("No such remote: %s"), rename.old);
+		die(_("No such remote: %s"), rename.old_name);
 
-	if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
+	if (!strcmp(rename.old_name, rename.new_name) && oldremote->origin != REMOTE_CONFIG)
 		return migrate_file(oldremote);
 
-	newremote = remote_get(rename.new);
+	newremote = remote_get(rename.new_name);
 	if (remote_is_configured(newremote, 1))
-		die(_("remote %s already exists."), rename.new);
+		die(_("remote %s already exists."), rename.new_name);
 
-	strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
+	strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new_name);
 	if (!valid_fetch_refspec(buf.buf))
-		die(_("'%s' is not a valid remote name"), rename.new);
+		die(_("'%s' is not a valid remote name"), rename.new_name);
 
 	strbuf_reset(&buf);
-	strbuf_addf(&buf, "remote.%s", rename.old);
-	strbuf_addf(&buf2, "remote.%s", rename.new);
+	strbuf_addf(&buf, "remote.%s", rename.old_name);
+	strbuf_addf(&buf2, "remote.%s", rename.new_name);
 	if (git_config_rename_section(buf.buf, buf2.buf) < 1)
 		return error(_("Could not rename config section '%s' to '%s'"),
 				buf.buf, buf2.buf);
 
 	strbuf_reset(&buf);
-	strbuf_addf(&buf, "remote.%s.fetch", rename.new);
+	strbuf_addf(&buf, "remote.%s.fetch", rename.new_name);
 	git_config_set_multivar(buf.buf, NULL, NULL, 1);
-	strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old);
+	strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old_name);
 	for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
 		char *ptr;
 
@@ -655,8 +655,8 @@ static int mv(int argc, const char **argv)
 			refspec_updated = 1;
 			strbuf_splice(&buf2,
 				      ptr-buf2.buf + strlen(":refs/remotes/"),
-				      strlen(rename.old), rename.new,
-				      strlen(rename.new));
+				      strlen(rename.old_name), rename.new_name,
+				      strlen(rename.new_name));
 		} else
 			warning(_("Not updating non-default fetch refspec\n"
 				  "\t%s\n"
@@ -670,10 +670,10 @@ static int mv(int argc, const char **argv)
 	for (i = 0; i < branch_list.nr; i++) {
 		struct string_list_item *item = branch_list.items + i;
 		struct branch_info *info = item->util;
-		if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
+		if (info->remote_name && !strcmp(info->remote_name, rename.old_name)) {
 			strbuf_reset(&buf);
 			strbuf_addf(&buf, "branch.%s.remote", item->string);
-			git_config_set(buf.buf, rename.new);
+			git_config_set(buf.buf, rename.new_name);
 		}
 	}
 
@@ -703,8 +703,8 @@ static int mv(int argc, const char **argv)
 			continue;
 		strbuf_reset(&buf);
 		strbuf_addstr(&buf, item->string);
-		strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
-				rename.new, strlen(rename.new));
+		strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old_name),
+				rename.new_name, strlen(rename.new_name));
 		strbuf_reset(&buf2);
 		strbuf_addf(&buf2, "remote: renamed %s to %s",
 				item->string, buf.buf);
@@ -718,12 +718,12 @@ static int mv(int argc, const char **argv)
 			continue;
 		strbuf_reset(&buf);
 		strbuf_addstr(&buf, item->string);
-		strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
-				rename.new, strlen(rename.new));
+		strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old_name),
+				rename.new_name, strlen(rename.new_name));
 		strbuf_reset(&buf2);
 		strbuf_addstr(&buf2, item->util);
-		strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
-				rename.new, strlen(rename.new));
+		strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old_name),
+				rename.new_name, strlen(rename.new_name));
 		strbuf_reset(&buf3);
 		strbuf_addf(&buf3, "remote: renamed %s to %s",
 				item->string, buf.buf);
@@ -822,7 +822,7 @@ static void clear_push_info(void *util, const char *string)
 
 static void free_remote_ref_states(struct ref_states *states)
 {
-	string_list_clear(&states->new, 0);
+	string_list_clear(&states->new_refs, 0);
 	string_list_clear(&states->stale, 1);
 	string_list_clear(&states->tracked, 0);
 	string_list_clear(&states->heads, 0);
@@ -907,7 +907,7 @@ static int show_remote_info_item(struct string_list_item *item, void *cb_data)
 	if (states->queried) {
 		const char *fmt = "%s";
 		const char *arg = "";
-		if (string_list_has_string(&states->new, name)) {
+		if (string_list_has_string(&states->new_refs, name)) {
 			fmt = _(" new (next fetch will store in remotes/%s)");
 			arg = states->remote->name;
 		} else if (string_list_has_string(&states->tracked, name))
@@ -1176,7 +1176,7 @@ static int show(int argc, const char **argv)
 
 		/* remote branch info */
 		info.width = 0;
-		for_each_string_list(&states.new, add_remote_to_show_info, &info);
+		for_each_string_list(&states.new_refs, add_remote_to_show_info, &info);
 		for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
 		for_each_string_list(&states.stale, add_remote_to_show_info, &info);
 		if (info.list->nr)
diff --git a/builtin/replace.c b/builtin/replace.c
index 10078ae..935647b 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -53,11 +53,11 @@ static int show_reference(const char *refname, const struct object_id *oid,
 			if (get_oid(refname, &object))
 				return error("Failed to resolve '%s' as a valid ref.", refname);
 
-			obj_type = sha1_object_info(object.hash, NULL);
-			repl_type = sha1_object_info(oid->hash, NULL);
+			obj_type = oid_object_info(&object, NULL);
+			repl_type = oid_object_info(oid, NULL);
 
-			printf("%s (%s) -> %s (%s)\n", refname, typename(obj_type),
-			       oid_to_hex(oid), typename(repl_type));
+			printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type),
+			       oid_to_hex(oid), type_name(repl_type));
 		}
 	}
 
@@ -162,14 +162,14 @@ static int replace_object_oid(const char *object_ref,
 	struct ref_transaction *transaction;
 	struct strbuf err = STRBUF_INIT;
 
-	obj_type = sha1_object_info(object->hash, NULL);
-	repl_type = sha1_object_info(repl->hash, NULL);
+	obj_type = oid_object_info(object, NULL);
+	repl_type = oid_object_info(repl, NULL);
 	if (!force && obj_type != repl_type)
 		die("Objects must be of the same type.\n"
 		    "'%s' points to a replaced object of type '%s'\n"
 		    "while '%s' points to a replacement object of type '%s'.",
-		    object_ref, typename(obj_type),
-		    replace_ref, typename(repl_type));
+		    object_ref, type_name(obj_type),
+		    replace_ref, type_name(repl_type));
 
 	check_ref_valid(object, &prev, &ref, force);
 
@@ -215,7 +215,7 @@ static void export_object(const struct object_id *oid, enum object_type type,
 	argv_array_push(&cmd.args, "--no-replace-objects");
 	argv_array_push(&cmd.args, "cat-file");
 	if (raw)
-		argv_array_push(&cmd.args, typename(type));
+		argv_array_push(&cmd.args, type_name(type));
 	else
 		argv_array_push(&cmd.args, "-p");
 	argv_array_push(&cmd.args, oid_to_hex(oid));
@@ -284,30 +284,30 @@ static int edit_and_replace(const char *object_ref, int force, int raw)
 {
 	char *tmpfile = git_pathdup("REPLACE_EDITOBJ");
 	enum object_type type;
-	struct object_id old, new, prev;
+	struct object_id old_oid, new_oid, prev;
 	struct strbuf ref = STRBUF_INIT;
 
-	if (get_oid(object_ref, &old) < 0)
+	if (get_oid(object_ref, &old_oid) < 0)
 		die("Not a valid object name: '%s'", object_ref);
 
-	type = sha1_object_info(old.hash, NULL);
+	type = oid_object_info(&old_oid, NULL);
 	if (type < 0)
-		die("unable to get object type for %s", oid_to_hex(&old));
+		die("unable to get object type for %s", oid_to_hex(&old_oid));
 
-	check_ref_valid(&old, &prev, &ref, force);
+	check_ref_valid(&old_oid, &prev, &ref, force);
 	strbuf_release(&ref);
 
-	export_object(&old, type, raw, tmpfile);
+	export_object(&old_oid, type, raw, tmpfile);
 	if (launch_editor(tmpfile, NULL, NULL) < 0)
 		die("editing object file failed");
-	import_object(&new, type, raw, tmpfile);
+	import_object(&new_oid, type, raw, tmpfile);
 
 	free(tmpfile);
 
-	if (!oidcmp(&old, &new))
-		return error("new object is the same as the old one: '%s'", oid_to_hex(&old));
+	if (!oidcmp(&old_oid, &new_oid))
+		return error("new object is the same as the old one: '%s'", oid_to_hex(&old_oid));
 
-	return replace_object_oid(object_ref, &old, "replacement", &new, force);
+	return replace_object_oid(object_ref, &old_oid, "replacement", &new_oid, force);
 }
 
 static void replace_parents(struct strbuf *buf, int argc, const char **argv)
@@ -355,7 +355,7 @@ static void check_one_mergetag(struct commit *commit,
 	struct tag *tag;
 	int i;
 
-	hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), tag_oid.hash);
+	hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid);
 	tag = lookup_tag(&tag_oid);
 	if (!tag)
 		die(_("bad mergetag in commit '%s'"), ref);
@@ -386,16 +386,16 @@ static void check_mergetags(struct commit *commit, int argc, const char **argv)
 
 static int create_graft(int argc, const char **argv, int force)
 {
-	struct object_id old, new;
+	struct object_id old_oid, new_oid;
 	const char *old_ref = argv[0];
 	struct commit *commit;
 	struct strbuf buf = STRBUF_INIT;
 	const char *buffer;
 	unsigned long size;
 
-	if (get_oid(old_ref, &old) < 0)
+	if (get_oid(old_ref, &old_oid) < 0)
 		die(_("Not a valid object name: '%s'"), old_ref);
-	commit = lookup_commit_or_die(&old, old_ref);
+	commit = lookup_commit_or_die(&old_oid, old_ref);
 
 	buffer = get_commit_buffer(commit, &size);
 	strbuf_add(&buf, buffer, size);
@@ -410,15 +410,15 @@ static int create_graft(int argc, const char **argv, int force)
 
 	check_mergetags(commit, argc, argv);
 
-	if (write_sha1_file(buf.buf, buf.len, commit_type, new.hash))
+	if (write_object_file(buf.buf, buf.len, commit_type, &new_oid))
 		die(_("could not write replacement commit for: '%s'"), old_ref);
 
 	strbuf_release(&buf);
 
-	if (!oidcmp(&old, &new))
-		return error("new commit is the same as the old one: '%s'", oid_to_hex(&old));
+	if (!oidcmp(&old_oid, &new_oid))
+		return error("new commit is the same as the old one: '%s'", oid_to_hex(&old_oid));
 
-	return replace_object_oid(old_ref, &old, "replacement", &new, force);
+	return replace_object_oid(old_ref, &old_oid, "replacement", &new_oid, force);
 }
 
 int cmd_replace(int argc, const char **argv, const char *prefix)
@@ -439,7 +439,8 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
 		OPT_CMDMODE('d', "delete", &cmdmode, N_("delete replace refs"), MODE_DELETE),
 		OPT_CMDMODE('e', "edit", &cmdmode, N_("edit existing object"), MODE_EDIT),
 		OPT_CMDMODE('g', "graft", &cmdmode, N_("change a commit's parents"), MODE_GRAFT),
-		OPT_BOOL('f', "force", &force, N_("replace the ref if it exists")),
+		OPT_BOOL_F('f', "force", &force, N_("replace the ref if it exists"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL(0, "raw", &raw, N_("do not pretty-print contents for --edit")),
 		OPT_STRING(0, "format", &format, N_("format"), N_("use this format")),
 		OPT_END()
diff --git a/builtin/reset.c b/builtin/reset.c
index e15f595..7f1c3f0 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -106,24 +106,16 @@ out:
 
 static void print_new_head_line(struct commit *commit)
 {
-	const char *hex, *body;
-	const char *msg;
-
-	hex = find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
-	printf(_("HEAD is now at %s"), hex);
-	msg = logmsg_reencode(commit, NULL, get_log_output_encoding());
-	body = strstr(msg, "\n\n");
-	if (body) {
-		const char *eol;
-		size_t len;
-		body = skip_blank_lines(body + 2);
-		eol = strchr(body, '\n');
-		len = eol ? eol - body : strlen(body);
-		printf(" %.*s\n", (int) len, body);
-	}
-	else
-		printf("\n");
-	unuse_commit_buffer(commit, msg);
+	struct strbuf buf = STRBUF_INIT;
+
+	printf(_("HEAD is now at %s"),
+		find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
+
+	pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
+	if (buf.len > 0)
+		printf(" %s", buf.buf);
+	putchar('\n');
+	strbuf_release(&buf);
 }
 
 static void update_index_from_diff(struct diff_queue_struct *q,
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 48300d9..fadd3ec 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -108,7 +108,7 @@ static void show_commit(struct commit *commit, void *data)
 	if (!revs->graph)
 		fputs(get_revision_mark(revs, commit), stdout);
 	if (revs->abbrev_commit && revs->abbrev)
-		fputs(find_unique_abbrev(commit->object.oid.hash, revs->abbrev),
+		fputs(find_unique_abbrev(&commit->object.oid, revs->abbrev),
 		      stdout);
 	else
 		fputs(oid_to_hex(&commit->object.oid), stdout);
@@ -134,7 +134,7 @@ static void show_commit(struct commit *commit, void *data)
 	else
 		putchar('\n');
 
-	if (revs->verbose_header && get_cached_commit_buffer(commit, NULL)) {
+	if (revs->verbose_header) {
 		struct strbuf buf = STRBUF_INIT;
 		struct pretty_print_context ctx = {0};
 		ctx.abbrev = revs->abbrev;
@@ -536,7 +536,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 		mark_edges_uninteresting(&revs, show_edge);
 
 	if (bisect_list) {
-		int reaches = reaches, all = all;
+		int reaches, all;
 
 		find_bisection(&revs.commits, &reaches, &all, bisect_find_all);
 
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 96d06a5..36b2087 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -159,7 +159,7 @@ static void show_rev(int type, const struct object_id *oid, const char *name)
 		}
 	}
 	else if (abbrev)
-		show_with_type(type, find_unique_abbrev(oid->hash, abbrev));
+		show_with_type(type, find_unique_abbrev(oid, abbrev));
 	else
 		show_with_type(type, oid_to_hex(oid));
 }
@@ -243,28 +243,28 @@ static int show_file(const char *arg, int output_prefix)
 static int try_difference(const char *arg)
 {
 	char *dotdot;
-	struct object_id oid;
-	struct object_id end;
-	const char *next;
-	const char *this;
+	struct object_id start_oid;
+	struct object_id end_oid;
+	const char *end;
+	const char *start;
 	int symmetric;
 	static const char head_by_default[] = "HEAD";
 
 	if (!(dotdot = strstr(arg, "..")))
 		return 0;
-	next = dotdot + 2;
-	this = arg;
-	symmetric = (*next == '.');
+	end = dotdot + 2;
+	start = arg;
+	symmetric = (*end == '.');
 
 	*dotdot = 0;
-	next += symmetric;
+	end += symmetric;
 
-	if (!*next)
-		next = head_by_default;
+	if (!*end)
+		end = head_by_default;
 	if (dotdot == arg)
-		this = head_by_default;
+		start = head_by_default;
 
-	if (this == head_by_default && next == head_by_default &&
+	if (start == head_by_default && end == head_by_default &&
 	    !symmetric) {
 		/*
 		 * Just ".."?  That is not a range but the
@@ -274,14 +274,14 @@ static int try_difference(const char *arg)
 		return 0;
 	}
 
-	if (!get_oid_committish(this, &oid) && !get_oid_committish(next, &end)) {
-		show_rev(NORMAL, &end, next);
-		show_rev(symmetric ? NORMAL : REVERSED, &oid, this);
+	if (!get_oid_committish(start, &start_oid) && !get_oid_committish(end, &end_oid)) {
+		show_rev(NORMAL, &end_oid, end);
+		show_rev(symmetric ? NORMAL : REVERSED, &start_oid, start);
 		if (symmetric) {
 			struct commit_list *exclude;
 			struct commit *a, *b;
-			a = lookup_commit_reference(&oid);
-			b = lookup_commit_reference(&end);
+			a = lookup_commit_reference(&start_oid);
+			b = lookup_commit_reference(&end_oid);
 			exclude = get_merge_bases(a, b);
 			while (exclude) {
 				struct commit *commit = pop_commit(&exclude);
diff --git a/builtin/rm.c b/builtin/rm.c
index 4a2fcca..5b6fc7e 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -178,7 +178,7 @@ static int check_local_mod(struct object_id *head, int index_only)
 		 * way as changed from the HEAD.
 		 */
 		if (no_head
-		     || get_tree_entry(head->hash, name, oid.hash, &mode)
+		     || get_tree_entry(head, name, &oid, &mode)
 		     || ce->ce_mode != create_ce_mode(mode)
 		     || oidcmp(&ce->oid, &oid))
 			staged_changes = 1;
@@ -242,7 +242,7 @@ static struct option builtin_rm_options[] = {
 	OPT__DRY_RUN(&show_only, N_("dry run")),
 	OPT__QUIET(&quiet, N_("do not list removed files")),
 	OPT_BOOL( 0 , "cached",         &index_only, N_("only remove from the index")),
-	OPT__FORCE(&force, N_("override the up-to-date check")),
+	OPT__FORCE(&force, N_("override the up-to-date check"), PARSE_OPT_NOCOMPLETE),
 	OPT_BOOL('r', NULL,             &recursive,  N_("allow recursive removal")),
 	OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch,
 				N_("exit with a zero status even if nothing matched")),
@@ -385,10 +385,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 			stage_updated_gitmodules(&the_index);
 	}
 
-	if (active_cache_changed) {
-		if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-			die(_("Unable to write new index file"));
-	}
+	if (write_locked_index(&the_index, &lock_file,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		die(_("Unable to write new index file"));
 
 	return 0;
 }
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index e29875b..608d6ba 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -11,7 +11,8 @@
 #include "parse-options.h"
 
 static char const * const shortlog_usage[] = {
-	N_("git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"),
+	N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"),
+	N_("git log --pretty=short | git shortlog [<options>]"),
 	NULL
 };
 
@@ -283,6 +284,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 	for (;;) {
 		switch (parse_options_step(&ctx, options, shortlog_usage)) {
 		case PARSE_OPT_HELP:
+		case PARSE_OPT_ERROR:
 			exit(129);
 		case PARSE_OPT_DONE:
 			goto parse_done;
@@ -292,6 +294,11 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 parse_done:
 	argc = parse_options_end(&ctx);
 
+	if (nongit && argc > 1) {
+		error(_("too many arguments given outside repository"));
+		usage_with_options(shortlog_usage, options);
+	}
+
 	if (setup_revisions(argc, argv, &rev, NULL) != 1) {
 		error(_("unrecognized argument: %s"), argv[1]);
 		usage_with_options(shortlog_usage, options);
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index e8a4aa4..6c2148b 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -292,7 +292,7 @@ static void show_one_commit(struct commit *commit, int no_name)
 		}
 		else
 			printf("[%s] ",
-			       find_unique_abbrev(commit->object.oid.hash,
+			       find_unique_abbrev(&commit->object.oid,
 						  DEFAULT_ABBREV));
 	}
 	puts(pretty_str);
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 41e5e71..f2eb1a7 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -29,7 +29,7 @@ static void show_one(const char *refname, const struct object_id *oid)
 	if (quiet)
 		return;
 
-	hex = find_unique_abbrev(oid->hash, abbrev);
+	hex = find_unique_abbrev(oid, abbrev);
 	if (hash_only)
 		printf("%s\n", hex);
 	else
@@ -39,7 +39,7 @@ static void show_one(const char *refname, const struct object_id *oid)
 		return;
 
 	if (!peel_ref(refname, &peeled)) {
-		hex = find_unique_abbrev(peeled.hash, abbrev);
+		hex = find_unique_abbrev(&peeled, abbrev);
 		printf("%s %s^{}\n", hex, refname);
 	}
 }
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 6d8e002..a2327c9 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1020,7 +1020,7 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
 
 	struct option module_deinit_options[] = {
 		OPT__QUIET(&quiet, N_("Suppress submodule status output")),
-		OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes")),
+		OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes"), 0),
 		OPT_BOOL(0, "all", &all, N_("Unregister all submodules")),
 		OPT_END()
 	};
@@ -1043,7 +1043,7 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
 		die(_("Use '--all' if you really want to deinitialize all submodules"));
 
 	if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
-		BUG("module_list_compute should not choke on empty pathspec");
+		return 1;
 
 	info.prefix = prefix;
 	if (quiet)
diff --git a/builtin/tag.c b/builtin/tag.c
index a7e6a5b..8cff6d0 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -99,7 +99,8 @@ static int delete_tag(const char *name, const char *ref,
 {
 	if (delete_ref(NULL, ref, oid, 0))
 		return 1;
-	printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+	printf(_("Deleted tag '%s' (was %s)\n"), name,
+	       find_unique_abbrev(oid, DEFAULT_ABBREV));
 	return 0;
 }
 
@@ -167,7 +168,7 @@ static void write_tag_body(int fd, const struct object_id *oid)
 	enum object_type type;
 	char *buf, *sp;
 
-	buf = read_sha1_file(oid->hash, &type, &size);
+	buf = read_object_file(oid, &type, &size);
 	if (!buf)
 		return;
 	/* skip header */
@@ -187,13 +188,14 @@ static int build_tag_object(struct strbuf *buf, int sign, struct object_id *resu
 {
 	if (sign && do_sign(buf) < 0)
 		return error(_("unable to sign the tag"));
-	if (write_sha1_file(buf->buf, buf->len, tag_type, result->hash) < 0)
+	if (write_object_file(buf->buf, buf->len, tag_type, result) < 0)
 		return error(_("unable to write tag file"));
 	return 0;
 }
 
 struct create_tag_options {
 	unsigned int message_given:1;
+	unsigned int use_editor:1;
 	unsigned int sign;
 	enum {
 		CLEANUP_NONE,
@@ -210,7 +212,7 @@ static void create_tag(const struct object_id *object, const char *tag,
 	struct strbuf header = STRBUF_INIT;
 	char *path = NULL;
 
-	type = sha1_object_info(object->hash, NULL);
+	type = oid_object_info(object, NULL);
 	if (type <= OBJ_NONE)
 	    die(_("bad object type."));
 
@@ -220,11 +222,11 @@ static void create_tag(const struct object_id *object, const char *tag,
 		    "tag %s\n"
 		    "tagger %s\n\n",
 		    oid_to_hex(object),
-		    typename(type),
+		    type_name(type),
 		    tag,
 		    git_committer_info(IDENT_STRICT));
 
-	if (!opt->message_given) {
+	if (!opt->message_given || opt->use_editor) {
 		int fd;
 
 		/* write the template message before editing: */
@@ -233,7 +235,10 @@ static void create_tag(const struct object_id *object, const char *tag,
 		if (fd < 0)
 			die_errno(_("could not create file '%s'"), path);
 
-		if (!is_null_oid(prev)) {
+		if (opt->message_given) {
+			write_or_die(fd, buf->buf, buf->len);
+			strbuf_reset(buf);
+		} else if (!is_null_oid(prev)) {
 			write_tag_body(fd, prev);
 		} else {
 			struct strbuf buf = STRBUF_INIT;
@@ -289,17 +294,17 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
 		strbuf_addstr(sb, rla);
 	} else {
 		strbuf_addstr(sb, "tag: tagging ");
-		strbuf_add_unique_abbrev(sb, oid->hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(sb, oid, DEFAULT_ABBREV);
 	}
 
 	strbuf_addstr(sb, " (");
-	type = sha1_object_info(oid->hash, NULL);
+	type = oid_object_info(oid, NULL);
 	switch (type) {
 	default:
 		strbuf_addstr(sb, "object of unknown type");
 		break;
 	case OBJ_COMMIT:
-		if ((buf = read_sha1_file(oid->hash, &type, &size)) != NULL) {
+		if ((buf = read_object_file(oid, &type, &size)) != NULL) {
 			subject_len = find_commit_subject(buf, &subject_start);
 			strbuf_insert(sb, sb->len, subject_start, subject_len);
 		} else {
@@ -372,6 +377,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
 	struct ref_format format = REF_FORMAT_INIT;
 	int icase = 0;
+	int edit_flag = 0;
 	struct option options[] = {
 		OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
 		{ OPTION_INTEGER, 'n', NULL, &filter.lines, N_("n"),
@@ -386,12 +392,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_CALLBACK('m', "message", &msg, N_("message"),
 			     N_("tag message"), parse_msg_arg),
 		OPT_FILENAME('F', "file", &msgfile, N_("read message from file")),
+		OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")),
 		OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
 		OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"),
 			N_("how to strip spaces and #comments from message")),
 		OPT_STRING('u', "local-user", &keyid, N_("key-id"),
 					N_("use another key to sign the tag")),
-		OPT__FORCE(&force, N_("replace the tag if exists")),
+		OPT__FORCE(&force, N_("replace the tag if exists"), 0),
 		OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")),
 
 		OPT_GROUP(N_("Tag listing options")),
@@ -524,6 +531,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		die(_("tag '%s' already exists"), tag);
 
 	opt.message_given = msg.given || msgfile;
+	opt.use_editor = edit_flag;
 
 	if (!cleanup_arg || !strcmp(cleanup_arg, "strip"))
 		opt.cleanup_mode = CLEANUP_ALL;
@@ -551,7 +559,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		die("%s", err.buf);
 	ref_transaction_free(transaction);
 	if (force && !is_null_oid(&prev) && oidcmp(&prev, &object))
-		printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev.hash, DEFAULT_ABBREV));
+		printf(_("Updated tag '%s' (was %s)\n"), tag,
+		       find_unique_abbrev(&prev, DEFAULT_ABBREV));
 
 	UNLEAK(buf);
 	UNLEAK(ref);
diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 32e0155..300eb59 100644
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -9,7 +9,7 @@ static char *create_temp_file(struct object_id *oid)
 	unsigned long size;
 	int fd;
 
-	buf = read_sha1_file(oid->hash, &type, &size);
+	buf = read_object_file(oid, &type, &size);
 	if (!buf || type != OBJ_BLOB)
 		die("unable to read blob object %s", oid_to_hex(oid));
 
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 62ea264..b7755c6 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -21,7 +21,7 @@ static unsigned char buffer[4096];
 static unsigned int offset, len;
 static off_t consumed_bytes;
 static off_t max_input_size;
-static git_SHA_CTX ctx;
+static git_hash_ctx ctx;
 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
 
 /*
@@ -62,7 +62,7 @@ static void *fill(int min)
 	if (min > sizeof(buffer))
 		die("cannot fill %d bytes", min);
 	if (offset) {
-		git_SHA1_Update(&ctx, buffer, offset);
+		the_hash_algo->update_fn(&ctx, buffer, offset);
 		memmove(buffer, buffer + offset, len);
 		offset = 0;
 	}
@@ -158,6 +158,7 @@ struct obj_info {
 	struct object *obj;
 };
 
+/* Remember to update object flag allocation in object.h */
 #define FLAG_OPEN (1u<<20)
 #define FLAG_WRITTEN (1u<<21)
 
@@ -172,7 +173,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
 {
 	struct object_id oid;
 
-	if (write_sha1_file(obj_buf->buffer, obj_buf->size, typename(obj->type), oid.hash) < 0)
+	if (write_object_file(obj_buf->buffer, obj_buf->size,
+			      type_name(obj->type), &oid) < 0)
 		die("failed to write object %s", oid_to_hex(&obj->oid));
 	obj->flags |= FLAG_WRITTEN;
 }
@@ -197,7 +199,7 @@ static int check_object(struct object *obj, int type, void *data, struct fsck_op
 
 	if (!(obj->flags & FLAG_OPEN)) {
 		unsigned long size;
-		int type = sha1_object_info(obj->oid.hash, &size);
+		int type = oid_object_info(&obj->oid, &size);
 		if (type != obj->type || type <= 0)
 			die("object of unexpected type");
 		obj->flags |= FLAG_WRITTEN;
@@ -237,14 +239,16 @@ static void write_object(unsigned nr, enum object_type type,
 			 void *buf, unsigned long size)
 {
 	if (!strict) {
-		if (write_sha1_file(buf, size, typename(type), obj_list[nr].oid.hash) < 0)
+		if (write_object_file(buf, size, type_name(type),
+				      &obj_list[nr].oid) < 0)
 			die("failed to write object");
 		added_object(nr, type, buf, size);
 		free(buf);
 		obj_list[nr].obj = NULL;
 	} else if (type == OBJ_BLOB) {
 		struct blob *blob;
-		if (write_sha1_file(buf, size, typename(type), obj_list[nr].oid.hash) < 0)
+		if (write_object_file(buf, size, type_name(type),
+				      &obj_list[nr].oid) < 0)
 			die("failed to write object");
 		added_object(nr, type, buf, size);
 		free(buf);
@@ -258,12 +262,12 @@ static void write_object(unsigned nr, enum object_type type,
 	} else {
 		struct object *obj;
 		int eaten;
-		hash_sha1_file(buf, size, typename(type), obj_list[nr].oid.hash);
+		hash_object_file(buf, size, type_name(type), &obj_list[nr].oid);
 		added_object(nr, type, buf, size);
 		obj = parse_object_buffer(&obj_list[nr].oid, type, size, buf,
 					  &eaten);
 		if (!obj)
-			die("invalid %s", typename(type));
+			die("invalid %s", type_name(type));
 		add_object_buffer(obj, buf, size);
 		obj->flags |= FLAG_OPEN;
 		obj_list[nr].obj = obj;
@@ -345,8 +349,8 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 	struct object_id base_oid;
 
 	if (type == OBJ_REF_DELTA) {
-		hashcpy(base_oid.hash, fill(GIT_SHA1_RAWSZ));
-		use(GIT_SHA1_RAWSZ);
+		hashcpy(base_oid.hash, fill(the_hash_algo->rawsz));
+		use(the_hash_algo->rawsz);
 		delta_data = get_data(delta_size);
 		if (dry_run || !delta_data) {
 			free(delta_data);
@@ -419,7 +423,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 	if (resolve_against_held(nr, &base_oid, delta_data, delta_size))
 		return;
 
-	base = read_sha1_file(base_oid.hash, &type, &base_size);
+	base = read_object_file(&base_oid, &type, &base_size);
 	if (!base) {
 		error("failed to read delta-pack base object %s",
 		      oid_to_hex(&base_oid));
@@ -564,15 +568,15 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
 		/* We don't take any non-flag arguments now.. Maybe some day */
 		usage(unpack_usage);
 	}
-	git_SHA1_Init(&ctx);
+	the_hash_algo->init_fn(&ctx);
 	unpack_all();
-	git_SHA1_Update(&ctx, buffer, offset);
-	git_SHA1_Final(oid.hash, &ctx);
+	the_hash_algo->update_fn(&ctx, buffer, offset);
+	the_hash_algo->final_fn(oid.hash, &ctx);
 	if (strict)
 		write_rest();
-	if (hashcmp(fill(GIT_SHA1_RAWSZ), oid.hash))
+	if (hashcmp(fill(the_hash_algo->rawsz), oid.hash))
 		die("final sha1 did not match");
-	use(GIT_SHA1_RAWSZ);
+	use(the_hash_algo->rawsz);
 
 	/* Write the last part of the buffer to stdout */
 	while (len) {
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 58d1c2d..10d070a 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -592,7 +592,7 @@ static struct cache_entry *read_one_ent(const char *which,
 	int size;
 	struct cache_entry *ce;
 
-	if (get_tree_entry(ent->hash, path, oid.hash, &mode)) {
+	if (get_tree_entry(ent, path, &oid, &mode)) {
 		if (which)
 			error("%s: not in %s branch.", path, which);
 		return NULL;
@@ -1059,6 +1059,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 			break;
 		switch (parseopt_state) {
 		case PARSE_OPT_HELP:
+		case PARSE_OPT_ERROR:
 			exit(129);
 		case PARSE_OPT_NON_OPTION:
 		case PARSE_OPT_DONE:
diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index 873070e..4321a34 100644
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -12,7 +12,7 @@ int cmd_update_server_info(int argc, const char **argv, const char *prefix)
 {
 	int force = 0;
 	struct option options[] = {
-		OPT__FORCE(&force, N_("update the info files from scratch")),
+		OPT__FORCE(&force, N_("update the info files from scratch"), 0),
 		OPT_END()
 	};
 
diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index ba38ac9..dcdaada 100644
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -44,12 +44,12 @@ static int verify_commit(const char *name, unsigned flags)
 	if (get_oid(name, &oid))
 		return error("commit '%s' not found.", name);
 
-	buf = read_sha1_file(oid.hash, &type, &size);
+	buf = read_object_file(&oid, &type, &size);
 	if (!buf)
 		return error("%s: unable to read file.", name);
 	if (type != OBJ_COMMIT)
 		return error("%s: cannot verify a non-commit object of type %s.",
-				name, typename(type));
+				name, type_name(type));
 
 	ret = run_gpg_verify(&oid, buf, size, flags);
 
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 7cef5b1..40a438e 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -14,10 +14,12 @@
 #include "worktree.h"
 
 static const char * const worktree_usage[] = {
-	N_("git worktree add [<options>] <path> [<branch>]"),
+	N_("git worktree add [<options>] <path> [<commit-ish>]"),
 	N_("git worktree list [<options>]"),
 	N_("git worktree lock [<options>] <path>"),
+	N_("git worktree move <worktree> <new-path>"),
 	N_("git worktree prune [<options>]"),
+	N_("git worktree remove [<options>] <worktree>"),
 	N_("git worktree unlock <path>"),
 	NULL
 };
@@ -99,16 +101,9 @@ static int prune_worktree(const char *id, struct strbuf *reason)
 	}
 	path[len] = '\0';
 	if (!file_exists(path)) {
-		struct stat st_link;
 		free(path);
-		/*
-		 * the repo is moved manually and has not been
-		 * accessed since?
-		 */
-		if (!stat(git_path("worktrees/%s/link", id), &st_link) &&
-		    st_link.st_nlink > 1)
-			return 0;
-		if (st.st_mtime <= expire) {
+		if (stat(git_path("worktrees/%s/index", id), &st) ||
+		    st.st_mtime <= expire) {
 			strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id);
 			return 1;
 		} else {
@@ -345,9 +340,23 @@ done:
 	 * Hook failure does not warrant worktree deletion, so run hook after
 	 * is_junk is cleared, but do return appropriate code when hook fails.
 	 */
-	if (!ret && opts->checkout)
-		ret = run_hook_le(NULL, "post-checkout", oid_to_hex(&null_oid),
-				  oid_to_hex(&commit->object.oid), "1", NULL);
+	if (!ret && opts->checkout) {
+		const char *hook = find_hook("post-checkout");
+		if (hook) {
+			const char *env[] = { "GIT_DIR", "GIT_WORK_TREE", NULL };
+			cp.git_cmd = 0;
+			cp.no_stdin = 1;
+			cp.stdout_to_stderr = 1;
+			cp.dir = path;
+			cp.env = env;
+			cp.argv = NULL;
+			argv_array_pushl(&cp.args, absolute_path(hook),
+					 oid_to_hex(&null_oid),
+					 oid_to_hex(&commit->object.oid),
+					 "1", NULL);
+			ret = run_command(&cp);
+		}
+	}
 
 	argv_array_clear(&child_env);
 	strbuf_release(&sb);
@@ -365,7 +374,9 @@ static int add(int ac, const char **av, const char *prefix)
 	const char *branch;
 	const char *opt_track = NULL;
 	struct option options[] = {
-		OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")),
+		OPT__FORCE(&opts.force,
+			   N_("checkout <branch> even if already checked out in other worktree"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
 			   N_("create a new branch")),
 		OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
@@ -484,7 +495,7 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
 		strbuf_addstr(&sb, "(bare)");
 	else {
 		strbuf_addf(&sb, "%-*s ", abbrev_len,
-				find_unique_abbrev(wt->head_oid.hash, DEFAULT_ABBREV));
+				find_unique_abbrev(&wt->head_oid, DEFAULT_ABBREV));
 		if (wt->is_detached)
 			strbuf_addstr(&sb, "(detached HEAD)");
 		else if (wt->head_ref) {
@@ -509,7 +520,7 @@ static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
 
 		if (path_len > *maxlen)
 			*maxlen = path_len;
-		sha1_len = strlen(find_unique_abbrev(wt[i]->head_oid.hash, *abbrev));
+		sha1_len = strlen(find_unique_abbrev(&wt[i]->head_oid, *abbrev));
 		if (sha1_len > *abbrev)
 			*abbrev = sha1_len;
 	}
@@ -605,6 +616,220 @@ static int unlock_worktree(int ac, const char **av, const char *prefix)
 	return ret;
 }
 
+static void validate_no_submodules(const struct worktree *wt)
+{
+	struct index_state istate = { NULL };
+	int i, found_submodules = 0;
+
+	if (read_index_from(&istate, worktree_git_path(wt, "index"),
+			    get_worktree_git_dir(wt)) > 0) {
+		for (i = 0; i < istate.cache_nr; i++) {
+			struct cache_entry *ce = istate.cache[i];
+
+			if (S_ISGITLINK(ce->ce_mode)) {
+				found_submodules = 1;
+				break;
+			}
+		}
+	}
+	discard_index(&istate);
+
+	if (found_submodules)
+		die(_("working trees containing submodules cannot be moved or removed"));
+}
+
+static int move_worktree(int ac, const char **av, const char *prefix)
+{
+	struct option options[] = {
+		OPT_END()
+	};
+	struct worktree **worktrees, *wt;
+	struct strbuf dst = STRBUF_INIT;
+	struct strbuf errmsg = STRBUF_INIT;
+	const char *reason;
+	char *path;
+
+	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+	if (ac != 2)
+		usage_with_options(worktree_usage, options);
+
+	path = prefix_filename(prefix, av[1]);
+	strbuf_addstr(&dst, path);
+	free(path);
+
+	worktrees = get_worktrees(0);
+	wt = find_worktree(worktrees, prefix, av[0]);
+	if (!wt)
+		die(_("'%s' is not a working tree"), av[0]);
+	if (is_main_worktree(wt))
+		die(_("'%s' is a main working tree"), av[0]);
+	if (is_directory(dst.buf)) {
+		const char *sep = find_last_dir_sep(wt->path);
+
+		if (!sep)
+			die(_("could not figure out destination name from '%s'"),
+			    wt->path);
+		strbuf_trim_trailing_dir_sep(&dst);
+		strbuf_addstr(&dst, sep);
+	}
+	if (file_exists(dst.buf))
+		die(_("target '%s' already exists"), dst.buf);
+
+	validate_no_submodules(wt);
+
+	reason = is_worktree_locked(wt);
+	if (reason) {
+		if (*reason)
+			die(_("cannot move a locked working tree, lock reason: %s"),
+			    reason);
+		die(_("cannot move a locked working tree"));
+	}
+	if (validate_worktree(wt, &errmsg, 0))
+		die(_("validation failed, cannot move working tree: %s"),
+		    errmsg.buf);
+	strbuf_release(&errmsg);
+
+	if (rename(wt->path, dst.buf) == -1)
+		die_errno(_("failed to move '%s' to '%s'"), wt->path, dst.buf);
+
+	update_worktree_location(wt, dst.buf);
+
+	strbuf_release(&dst);
+	free_worktrees(worktrees);
+	return 0;
+}
+
+/*
+ * Note, "git status --porcelain" is used to determine if it's safe to
+ * delete a whole worktree. "git status" does not ignore user
+ * configuration, so if a normal "git status" shows "clean" for the
+ * user, then it's ok to remove it.
+ *
+ * This assumption may be a bad one. We may want to ignore
+ * (potentially bad) user settings and only delete a worktree when
+ * it's absolutely safe to do so from _our_ point of view because we
+ * know better.
+ */
+static void check_clean_worktree(struct worktree *wt,
+				 const char *original_path)
+{
+	struct argv_array child_env = ARGV_ARRAY_INIT;
+	struct child_process cp;
+	char buf[1];
+	int ret;
+
+	/*
+	 * Until we sort this out, all submodules are "dirty" and
+	 * will abort this function.
+	 */
+	validate_no_submodules(wt);
+
+	argv_array_pushf(&child_env, "%s=%s/.git",
+			 GIT_DIR_ENVIRONMENT, wt->path);
+	argv_array_pushf(&child_env, "%s=%s",
+			 GIT_WORK_TREE_ENVIRONMENT, wt->path);
+	memset(&cp, 0, sizeof(cp));
+	argv_array_pushl(&cp.args, "status",
+			 "--porcelain", "--ignore-submodules=none",
+			 NULL);
+	cp.env = child_env.argv;
+	cp.git_cmd = 1;
+	cp.dir = wt->path;
+	cp.out = -1;
+	ret = start_command(&cp);
+	if (ret)
+		die_errno(_("failed to run 'git status' on '%s'"),
+			  original_path);
+	ret = xread(cp.out, buf, sizeof(buf));
+	if (ret)
+		die(_("'%s' is dirty, use --force to delete it"),
+		    original_path);
+	close(cp.out);
+	ret = finish_command(&cp);
+	if (ret)
+		die_errno(_("failed to run 'git status' on '%s', code %d"),
+			  original_path, ret);
+}
+
+static int delete_git_work_tree(struct worktree *wt)
+{
+	struct strbuf sb = STRBUF_INIT;
+	int ret = 0;
+
+	strbuf_addstr(&sb, wt->path);
+	if (remove_dir_recursively(&sb, 0)) {
+		error_errno(_("failed to delete '%s'"), sb.buf);
+		ret = -1;
+	}
+	strbuf_release(&sb);
+	return ret;
+}
+
+static int delete_git_dir(struct worktree *wt)
+{
+	struct strbuf sb = STRBUF_INIT;
+	int ret = 0;
+
+	strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
+	if (remove_dir_recursively(&sb, 0)) {
+		error_errno(_("failed to delete '%s'"), sb.buf);
+		ret = -1;
+	}
+	strbuf_release(&sb);
+	return ret;
+}
+
+static int remove_worktree(int ac, const char **av, const char *prefix)
+{
+	int force = 0;
+	struct option options[] = {
+		OPT_BOOL(0, "force", &force,
+			 N_("force removing even if the worktree is dirty")),
+		OPT_END()
+	};
+	struct worktree **worktrees, *wt;
+	struct strbuf errmsg = STRBUF_INIT;
+	const char *reason;
+	int ret = 0;
+
+	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+	if (ac != 1)
+		usage_with_options(worktree_usage, options);
+
+	worktrees = get_worktrees(0);
+	wt = find_worktree(worktrees, prefix, av[0]);
+	if (!wt)
+		die(_("'%s' is not a working tree"), av[0]);
+	if (is_main_worktree(wt))
+		die(_("'%s' is a main working tree"), av[0]);
+	reason = is_worktree_locked(wt);
+	if (reason) {
+		if (*reason)
+			die(_("cannot remove a locked working tree, lock reason: %s"),
+			    reason);
+		die(_("cannot remove a locked working tree"));
+	}
+	if (validate_worktree(wt, &errmsg, WT_VALIDATE_WORKTREE_MISSING_OK))
+		die(_("validation failed, cannot remove working tree: %s"),
+		    errmsg.buf);
+	strbuf_release(&errmsg);
+
+	if (file_exists(wt->path)) {
+		if (!force)
+			check_clean_worktree(wt, av[0]);
+
+		ret |= delete_git_work_tree(wt);
+	}
+	/*
+	 * continue on even if ret is non-zero, there's no going back
+	 * from here.
+	 */
+	ret |= delete_git_dir(wt);
+
+	free_worktrees(worktrees);
+	return ret;
+}
+
 int cmd_worktree(int ac, const char **av, const char *prefix)
 {
 	struct option options[] = {
@@ -627,5 +852,9 @@ int cmd_worktree(int ac, const char **av, const char *prefix)
 		return lock_worktree(ac - 1, av + 1, prefix);
 	if (!strcmp(av[1], "unlock"))
 		return unlock_worktree(ac - 1, av + 1, prefix);
+	if (!strcmp(av[1], "move"))
+		return move_worktree(ac - 1, av + 1, prefix);
+	if (!strcmp(av[1], "remove"))
+		return remove_worktree(ac - 1, av + 1, prefix);
 	usage_with_options(worktree_usage, options);
 }
diff --git a/builtin/write-tree.c b/builtin/write-tree.c
index bd0a78a..c9d3c54 100644
--- a/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@ -19,7 +19,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
 {
 	int flags = 0, ret;
 	const char *prefix = NULL;
-	unsigned char sha1[20];
+	struct object_id oid;
 	const char *me = "git-write-tree";
 	struct option write_tree_options[] = {
 		OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"),
@@ -38,10 +38,10 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
 	argc = parse_options(argc, argv, unused_prefix, write_tree_options,
 			     write_tree_usage, 0);
 
-	ret = write_cache_as_tree(sha1, flags, prefix);
+	ret = write_cache_as_tree(&oid, flags, prefix);
 	switch (ret) {
 	case 0:
-		printf("%s\n", sha1_to_hex(sha1));
+		printf("%s\n", oid_to_hex(&oid));
 		break;
 	case WRITE_TREE_UNREADABLE_INDEX:
 		die("%s: error reading the index", me);
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 3310fd2..e5ce2a7 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -12,7 +12,7 @@ static struct bulk_checkin_state {
 	unsigned plugged:1;
 
 	char *pack_tmp_name;
-	struct sha1file *f;
+	struct hashfile *f;
 	off_t offset;
 	struct pack_idx_option pack_idx_opts;
 
@@ -35,9 +35,9 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
 		unlink(state->pack_tmp_name);
 		goto clear_exit;
 	} else if (state->nr_written == 1) {
-		sha1close(state->f, oid.hash, CSUM_FSYNC);
+		hashclose(state->f, oid.hash, CSUM_FSYNC);
 	} else {
-		int fd = sha1close(state->f, oid.hash, 0);
+		int fd = hashclose(state->f, oid.hash, 0);
 		fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name,
 					 state->nr_written, oid.hash,
 					 state->offset);
@@ -60,17 +60,17 @@ clear_exit:
 	reprepare_packed_git();
 }
 
-static int already_written(struct bulk_checkin_state *state, unsigned char sha1[])
+static int already_written(struct bulk_checkin_state *state, struct object_id *oid)
 {
 	int i;
 
 	/* The object may already exist in the repository */
-	if (has_sha1_file(sha1))
+	if (has_sha1_file(oid->hash))
 		return 1;
 
 	/* Might want to keep the list sorted */
 	for (i = 0; i < state->nr_written; i++)
-		if (!hashcmp(state->written[i]->oid.hash, sha1))
+		if (!oidcmp(&state->written[i]->oid, oid))
 			return 1;
 
 	/* This is a new object we need to keep */
@@ -93,7 +93,7 @@ static int already_written(struct bulk_checkin_state *state, unsigned char sha1[
  * with a new pack.
  */
 static int stream_to_pack(struct bulk_checkin_state *state,
-			  git_SHA_CTX *ctx, off_t *already_hashed_to,
+			  git_hash_ctx *ctx, off_t *already_hashed_to,
 			  int fd, size_t size, enum object_type type,
 			  const char *path, unsigned flags)
 {
@@ -127,7 +127,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 				if (rsize < hsize)
 					hsize = rsize;
 				if (hsize)
-					git_SHA1_Update(ctx, ibuf, hsize);
+					the_hash_algo->update_fn(ctx, ibuf, hsize);
 				*already_hashed_to = offset;
 			}
 			s.next_in = ibuf;
@@ -149,7 +149,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 					return -1;
 				}
 
-				sha1write(state->f, obuf, written);
+				hashwrite(state->f, obuf, written);
 				state->offset += written;
 			}
 			s.next_out = obuf;
@@ -186,16 +186,16 @@ static void prepare_to_stream(struct bulk_checkin_state *state,
 }
 
 static int deflate_to_pack(struct bulk_checkin_state *state,
-			   unsigned char result_sha1[],
+			   struct object_id *result_oid,
 			   int fd, size_t size,
 			   enum object_type type, const char *path,
 			   unsigned flags)
 {
 	off_t seekback, already_hashed_to;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 	unsigned char obuf[16384];
 	unsigned header_len;
-	struct sha1file_checkpoint checkpoint;
+	struct hashfile_checkpoint checkpoint;
 	struct pack_idx_entry *idx = NULL;
 
 	seekback = lseek(fd, 0, SEEK_CUR);
@@ -203,9 +203,9 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 		return error("cannot find the current offset");
 
 	header_len = xsnprintf((char *)obuf, sizeof(obuf), "%s %" PRIuMAX,
-			       typename(type), (uintmax_t)size) + 1;
-	git_SHA1_Init(&ctx);
-	git_SHA1_Update(&ctx, obuf, header_len);
+			       type_name(type), (uintmax_t)size) + 1;
+	the_hash_algo->init_fn(&ctx);
+	the_hash_algo->update_fn(&ctx, obuf, header_len);
 
 	/* Note: idx is non-NULL when we are writing */
 	if ((flags & HASH_WRITE_OBJECT) != 0)
@@ -216,7 +216,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 	while (1) {
 		prepare_to_stream(state, flags);
 		if (idx) {
-			sha1file_checkpoint(state->f, &checkpoint);
+			hashfile_checkpoint(state->f, &checkpoint);
 			idx->offset = state->offset;
 			crc32_begin(state->f);
 		}
@@ -230,23 +230,23 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 		 */
 		if (!idx)
 			die("BUG: should not happen");
-		sha1file_truncate(state->f, &checkpoint);
+		hashfile_truncate(state->f, &checkpoint);
 		state->offset = checkpoint.offset;
 		finish_bulk_checkin(state);
 		if (lseek(fd, seekback, SEEK_SET) == (off_t) -1)
 			return error("cannot seek back");
 	}
-	git_SHA1_Final(result_sha1, &ctx);
+	the_hash_algo->final_fn(result_oid->hash, &ctx);
 	if (!idx)
 		return 0;
 
 	idx->crc32 = crc32_end(state->f);
-	if (already_written(state, result_sha1)) {
-		sha1file_truncate(state->f, &checkpoint);
+	if (already_written(state, result_oid)) {
+		hashfile_truncate(state->f, &checkpoint);
 		state->offset = checkpoint.offset;
 		free(idx);
 	} else {
-		hashcpy(idx->oid.hash, result_sha1);
+		oidcpy(&idx->oid, result_oid);
 		ALLOC_GROW(state->written,
 			   state->nr_written + 1,
 			   state->alloc_written);
@@ -255,11 +255,11 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 	return 0;
 }
 
-int index_bulk_checkin(unsigned char *sha1,
+int index_bulk_checkin(struct object_id *oid,
 		       int fd, size_t size, enum object_type type,
 		       const char *path, unsigned flags)
 {
-	int status = deflate_to_pack(&state, sha1, fd, size, type,
+	int status = deflate_to_pack(&state, oid, fd, size, type,
 				     path, flags);
 	if (!state.plugged)
 		finish_bulk_checkin(&state);
diff --git a/bulk-checkin.h b/bulk-checkin.h
index fbd40fc..a855273 100644
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -4,7 +4,7 @@
 #ifndef BULK_CHECKIN_H
 #define BULK_CHECKIN_H
 
-extern int index_bulk_checkin(unsigned char sha1[],
+extern int index_bulk_checkin(struct object_id *oid,
 			      int fd, size_t size, enum object_type type,
 			      const char *path, unsigned flags);
 
diff --git a/bundle.c b/bundle.c
index efe547e..902c9b5 100644
--- a/bundle.c
+++ b/bundle.c
@@ -222,7 +222,7 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
 	if (revs->max_age == -1 && revs->min_age == -1)
 		goto out;
 
-	buf = read_sha1_file(tag->oid.hash, &type, &size);
+	buf = read_object_file(&tag->oid, &type, &size);
 	if (!buf)
 		goto out;
 	line = memmem(buf, size, "\ntagger ", 8);
diff --git a/cache-tree.c b/cache-tree.c
index 3841cef..6a555f4 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -320,7 +320,7 @@ static int update_one(struct cache_tree *it,
 		struct cache_tree_sub *sub = NULL;
 		const char *path, *slash;
 		int pathlen, entlen;
-		const unsigned char *sha1;
+		const struct object_id *oid;
 		unsigned mode;
 		int expected_missing = 0;
 		int contains_ita = 0;
@@ -338,7 +338,7 @@ static int update_one(struct cache_tree *it,
 				die("cache-tree.c: '%.*s' in '%s' not found",
 				    entlen, path + baselen, path);
 			i += sub->count;
-			sha1 = sub->cache_tree->oid.hash;
+			oid = &sub->cache_tree->oid;
 			mode = S_IFDIR;
 			contains_ita = sub->cache_tree->entry_count < 0;
 			if (contains_ita) {
@@ -347,19 +347,19 @@ static int update_one(struct cache_tree *it,
 			}
 		}
 		else {
-			sha1 = ce->oid.hash;
+			oid = &ce->oid;
 			mode = ce->ce_mode;
 			entlen = pathlen - baselen;
 			i++;
 		}
 
-		if (is_null_sha1(sha1) ||
-		    (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))) {
+		if (is_null_oid(oid) ||
+		    (mode != S_IFGITLINK && !missing_ok && !has_object_file(oid))) {
 			strbuf_release(&buffer);
 			if (expected_missing)
 				return -1;
 			return error("invalid object %06o %s for '%.*s'",
-				mode, sha1_to_hex(sha1), entlen+baselen, path);
+				mode, oid_to_hex(oid), entlen+baselen, path);
 		}
 
 		/*
@@ -385,12 +385,12 @@ static int update_one(struct cache_tree *it,
 		/*
 		 * "sub" can be an empty tree if all subentries are i-t-a.
 		 */
-		if (contains_ita && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN))
+		if (contains_ita && !oidcmp(oid, &empty_tree_oid))
 			continue;
 
 		strbuf_grow(&buffer, entlen + 100);
 		strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
-		strbuf_add(&buffer, sha1, 20);
+		strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
 
 #if DEBUG
 		fprintf(stderr, "cache-tree update-one %o %.*s\n",
@@ -399,16 +399,16 @@ static int update_one(struct cache_tree *it,
 	}
 
 	if (repair) {
-		unsigned char sha1[20];
-		hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
-		if (has_sha1_file(sha1))
-			hashcpy(it->oid.hash, sha1);
+		struct object_id oid;
+		hash_object_file(buffer.buf, buffer.len, tree_type, &oid);
+		if (has_object_file(&oid))
+			oidcpy(&it->oid, &oid);
 		else
 			to_invalidate = 1;
-	} else if (dryrun)
-		hash_sha1_file(buffer.buf, buffer.len, tree_type,
-			       it->oid.hash);
-	else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) {
+	} else if (dryrun) {
+		hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);
+	} else if (write_object_file(buffer.buf, buffer.len, tree_type,
+				     &it->oid)) {
 		strbuf_release(&buffer);
 		return -1;
 	}
@@ -465,7 +465,7 @@ static void write_one(struct strbuf *buffer, struct cache_tree *it,
 #endif
 
 	if (0 <= it->entry_count) {
-		strbuf_add(buffer, it->oid.hash, 20);
+		strbuf_add(buffer, it->oid.hash, the_hash_algo->rawsz);
 	}
 	for (i = 0; i < it->subtree_nr; i++) {
 		struct cache_tree_sub *down = it->down[i];
@@ -492,6 +492,7 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
 	char *ep;
 	struct cache_tree *it;
 	int i, subtree_nr;
+	const unsigned rawsz = the_hash_algo->rawsz;
 
 	it = NULL;
 	/* skip name, but make sure name exists */
@@ -520,11 +521,11 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
 		goto free_return;
 	buf++; size--;
 	if (0 <= it->entry_count) {
-		if (size < 20)
+		if (size < rawsz)
 			goto free_return;
-		hashcpy(it->oid.hash, (const unsigned char*)buf);
-		buf += 20;
-		size -= 20;
+		memcpy(it->oid.hash, (const unsigned char*)buf, rawsz);
+		buf += rawsz;
+		size -= rawsz;
 	}
 
 #if DEBUG
@@ -599,7 +600,7 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
 	return it;
 }
 
-int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
+int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
 {
 	int entries, was_valid;
 	struct lock_file lock_file = LOCK_INIT;
@@ -640,19 +641,19 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co
 			ret = WRITE_TREE_PREFIX_ERROR;
 			goto out;
 		}
-		hashcpy(sha1, subtree->oid.hash);
+		oidcpy(oid, &subtree->oid);
 	}
 	else
-		hashcpy(sha1, index_state->cache_tree->oid.hash);
+		oidcpy(oid, &index_state->cache_tree->oid);
 
 out:
 	rollback_lock_file(&lock_file);
 	return ret;
 }
 
-int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
+int write_cache_as_tree(struct object_id *oid, int flags, const char *prefix)
 {
-	return write_index_as_tree(sha1, &the_index, get_index_file(), flags, prefix);
+	return write_index_as_tree(oid, &the_index, get_index_file(), flags, prefix);
 }
 
 static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
diff --git a/cache-tree.h b/cache-tree.h
index f7b9cab..cfd5328 100644
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -47,8 +47,8 @@ int update_main_cache_tree(int);
 #define WRITE_TREE_UNMERGED_INDEX (-2)
 #define WRITE_TREE_PREFIX_ERROR (-3)
 
-int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
-int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
+int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
+int write_cache_as_tree(struct object_id *oid, int flags, const char *prefix);
 void prime_cache_tree(struct index_state *, struct tree *);
 
 extern int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info);
diff --git a/cache.h b/cache.h
index 720664e..bbaf5c3 100644
--- a/cache.h
+++ b/cache.h
@@ -16,31 +16,6 @@
 #include "sha1-array.h"
 #include "repository.h"
 
-#ifndef platform_SHA_CTX
-/*
- * platform's underlying implementation of SHA-1; could be OpenSSL,
- * blk_SHA, Apple CommonCrypto, etc...  Note that including
- * SHA1_HEADER may have already defined platform_SHA_CTX for our
- * own implementations like block-sha1 and ppc-sha1, so we list
- * the default for OpenSSL compatible SHA-1 implementations here.
- */
-#define platform_SHA_CTX	SHA_CTX
-#define platform_SHA1_Init	SHA1_Init
-#define platform_SHA1_Update	SHA1_Update
-#define platform_SHA1_Final    	SHA1_Final
-#endif
-
-#define git_SHA_CTX		platform_SHA_CTX
-#define git_SHA1_Init		platform_SHA1_Init
-#define git_SHA1_Update		platform_SHA1_Update
-#define git_SHA1_Final		platform_SHA1_Final
-
-#ifdef SHA1_MAX_BLOCK_SIZE
-#include "compat/sha1-chunked.h"
-#undef git_SHA1_Update
-#define git_SHA1_Update		git_SHA1_Update_Chunked
-#endif
-
 #include <zlib.h>
 typedef struct git_zstream {
 	z_stream z;
@@ -624,6 +599,7 @@ extern int read_index_unmerged(struct index_state *);
 
 /* For use with `write_locked_index()`. */
 #define COMMIT_LOCK		(1 << 0)
+#define SKIP_IF_UNCHANGED	(1 << 1)
 
 /*
  * Write the index while holding an already-taken lock. Close the lock,
@@ -640,6 +616,9 @@ extern int read_index_unmerged(struct index_state *);
  * With `COMMIT_LOCK`, the lock is always committed or rolled back.
  * Without it, the lock is closed, but neither committed nor rolled
  * back.
+ *
+ * If `SKIP_IF_UNCHANGED` is given and the index is unchanged, nothing
+ * is written (and the lock is rolled back if `COMMIT_LOCK` is given).
  */
 extern int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags);
 
@@ -970,14 +949,14 @@ extern void check_repository_format(void);
  * more calls to find_unique_abbrev are made.
  *
  * The `_r` variant writes to a buffer supplied by the caller, which must be at
- * least `GIT_SHA1_HEXSZ + 1` bytes. The return value is the number of bytes
+ * least `GIT_MAX_HEXSZ + 1` bytes. The return value is the number of bytes
  * written (excluding the NUL terminator).
  *
  * Note that while this version avoids the static buffer, it is not fully
  * reentrant, as it calls into other non-reentrant git code.
  */
-extern const char *find_unique_abbrev(const unsigned char *sha1, int len);
-extern int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len);
+extern const char *find_unique_abbrev(const struct object_id *oid, int len);
+extern int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len);
 
 extern const unsigned char null_sha1[GIT_MAX_RAWSZ];
 extern const struct object_id null_oid;
@@ -1026,7 +1005,7 @@ static inline void hashclr(unsigned char *hash)
 
 static inline void oidclr(struct object_id *oid)
 {
-	hashclr(oid->hash);
+	memset(oid->hash, 0, GIT_MAX_RAWSZ);
 }
 
 
@@ -1044,8 +1023,6 @@ extern const struct object_id empty_tree_oid;
 	"\xe6\x9d\xe2\x9b\xb2\xd1\xd6\x43\x4b\x8b" \
 	"\x29\xae\x77\x5a\xd8\xc2\xe4\x8c\x53\x91"
 extern const struct object_id empty_blob_oid;
-#define EMPTY_BLOB_SHA1_BIN (empty_blob_oid.hash)
-
 
 static inline int is_empty_blob_sha1(const unsigned char *sha1)
 {
@@ -1206,19 +1183,19 @@ extern char *xdg_config_home(const char *filename);
  */
 extern char *xdg_cache_home(const char *filename);
 
-extern void *read_sha1_file_extended(const unsigned char *sha1,
-				     enum object_type *type,
-				     unsigned long *size, int lookup_replace);
-static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
+extern void *read_object_file_extended(const struct object_id *oid,
+				       enum object_type *type,
+				       unsigned long *size, int lookup_replace);
+static inline void *read_object_file(const struct object_id *oid, enum object_type *type, unsigned long *size)
 {
-	return read_sha1_file_extended(sha1, type, size, 1);
+	return read_object_file_extended(oid, type, size, 1);
 }
 
 /*
  * This internal function is only declared here for the benefit of
  * lookup_replace_object().  Please do not call it directly.
  */
-extern const unsigned char *do_lookup_replace_object(const unsigned char *sha1);
+extern const struct object_id *do_lookup_replace_object(const struct object_id *oid);
 
 /*
  * If object sha1 should be replaced, return the replacement object's
@@ -1226,38 +1203,49 @@ extern const unsigned char *do_lookup_replace_object(const unsigned char *sha1);
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
  */
-static inline const unsigned char *lookup_replace_object(const unsigned char *sha1)
+static inline const struct object_id *lookup_replace_object(const struct object_id *oid)
 {
 	if (!check_replace_refs)
-		return sha1;
-	return do_lookup_replace_object(sha1);
+		return oid;
+	return do_lookup_replace_object(oid);
 }
 
-/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
-extern int sha1_object_info(const unsigned char *, unsigned long *);
-extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
-extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
-extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
-extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
-extern int force_object_loose(const unsigned char *sha1, time_t mtime);
+/* Read and unpack an object file into memory, write memory to an object file */
+extern int oid_object_info(const struct object_id *, unsigned long *);
+
+extern int hash_object_file(const void *buf, unsigned long len,
+			    const char *type, struct object_id *oid);
+
+extern int write_object_file(const void *buf, unsigned long len,
+			     const char *type, struct object_id *oid);
+
+extern int hash_object_file_literally(const void *buf, unsigned long len,
+				      const char *type, struct object_id *oid,
+				      unsigned flags);
+
+extern int pretend_object_file(void *, unsigned long, enum object_type,
+			       struct object_id *oid);
+
+extern int force_object_loose(const struct object_id *oid, time_t mtime);
+
 extern int git_open_cloexec(const char *name, int flags);
 #define git_open(name) git_open_cloexec(name, O_RDONLY)
 extern int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
 extern int parse_sha1_header(const char *hdr, unsigned long *sizep);
 
-extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
+extern int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type);
 
 extern int finalize_object_file(const char *tmpfile, const char *filename);
 
 /*
- * Open the loose object at path, check its sha1, and return the contents,
+ * Open the loose object at path, check its hash, and return the contents,
  * type, and size. If the object is a blob, then "contents" may return NULL,
  * to allow streaming of large blobs.
  *
  * Returns 0 on success, negative on error (details may be written to stderr).
  */
 int read_loose_object(const char *path,
-		      const unsigned char *expected_sha1,
+		      const struct object_id *expected_oid,
 		      enum object_type *type,
 		      unsigned long *size,
 		      void **contents);
@@ -1284,7 +1272,7 @@ extern int has_object_file_with_flags(const struct object_id *oid, int flags);
  */
 extern int has_loose_object_nonlocal(const unsigned char *sha1);
 
-extern void assert_sha1_type(const unsigned char *sha1, enum object_type expect);
+extern void assert_oid_type(const struct object_id *oid, enum object_type expect);
 
 /* Helper to check and "touch" a file */
 extern int check_and_freshen_file(const char *fn, int freshen);
@@ -1440,10 +1428,10 @@ extern int df_name_compare(const char *name1, int len1, int mode1, const char *n
 extern int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
 extern int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
 
-extern void *read_object_with_reference(const unsigned char *sha1,
+extern void *read_object_with_reference(const struct object_id *oid,
 					const char *required_type,
 					unsigned long *size,
-					unsigned char *sha1_ret);
+					struct object_id *oid_ret);
 
 extern struct object *peel_to_type(const char *name, int namelen,
 				   struct object *o, enum object_type);
@@ -1590,7 +1578,7 @@ struct pack_entry {
  * usual "XXXXXX" trailer, and the resulting filename is written into the
  * "template" buffer. Returns the open descriptor.
  */
-extern int odb_mkstemp(struct strbuf *template, const char *pattern);
+extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
 
 /*
  * Create a pack .keep file named "name" (which should generally be the output
@@ -1661,7 +1649,7 @@ struct object_info {
 	unsigned long *sizep;
 	off_t *disk_sizep;
 	unsigned char *delta_base_sha1;
-	struct strbuf *typename;
+	struct strbuf *type_name;
 	void **contentp;
 
 	/* Response */
@@ -1702,7 +1690,9 @@ struct object_info {
 #define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
-extern int sha1_object_info_extended(const unsigned char *, struct object_info *, unsigned flags);
+/* Do not check loose object */
+#define OBJECT_INFO_IGNORE_LOOSE 16
+extern int oid_object_info_extended(const struct object_id *, struct object_info *, unsigned flags);
 
 /*
  * Set this to 0 to prevent sha1_object_info_extended() from fetching missing
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 1efee55..109ef28 100755
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -97,7 +97,7 @@ fi
 export DEVELOPER=1
 export DEFAULT_TEST_TARGET=prove
 export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
-export GIT_TEST_OPTS="--verbose-log"
+export GIT_TEST_OPTS="--verbose-log -x"
 export GIT_TEST_CLONE_2GB=YesPlease
 
 case "$jobname" in
diff --git a/ci/run-tests.sh b/ci/run-build-and-tests.sh
index 73e273f..3735ce4 100755
--- a/ci/run-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 #
-# Test Git
+# Build and test Git
 #
 
 . ${0%/*}/lib-travisci.sh
 
 ln -s "$cache_dir/.prove" t/.prove
 
+make --jobs=2
 make --quiet test
 if test "$jobname" = "linux-gcc"
 then
diff --git a/ci/run-build.sh b/ci/run-build.sh
deleted file mode 100755
index 4f940d1..0000000
--- a/ci/run-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# Build Git
-#
-
-. ${0%/*}/lib-travisci.sh
-
-make --jobs=2
diff --git a/color.c b/color.c
index d48dd94..f277e72 100644
--- a/color.c
+++ b/color.c
@@ -161,11 +161,6 @@ int color_parse(const char *value, char *dst)
 	return color_parse_mem(value, strlen(value), dst);
 }
 
-void color_set(char *dst, const char *color_bytes)
-{
-	xsnprintf(dst, COLOR_MAXLEN, "%s", color_bytes);
-}
-
 /*
  * Write the ANSI color codes for "c" to "out"; the string should
  * already have the ANSI escape code in it. "out" should have enough
@@ -399,8 +394,6 @@ static int color_vfprintf(FILE *fp, const char *color, const char *fmt,
 	return r;
 }
 
-
-
 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...)
 {
 	va_list args;
diff --git a/color.h b/color.h
index fd2b688..cd0bced 100644
--- a/color.h
+++ b/color.h
@@ -76,22 +76,46 @@ int git_color_config(const char *var, const char *value, void *cb);
 int git_color_default_config(const char *var, const char *value, void *cb);
 
 /*
- * Set the color buffer (which must be COLOR_MAXLEN bytes)
- * to the raw color bytes; this is useful for initializing
- * default color variables.
+ * Parse a config option, which can be a boolean or one of
+ * "never", "auto", "always". Return a constant of
+ * GIT_COLOR_NEVER for "never" or negative boolean,
+ * GIT_COLOR_ALWAYS for "always" or a positive boolean,
+ * and GIT_COLOR_AUTO for "auto".
  */
-void color_set(char *dst, const char *color_bytes);
-
 int git_config_colorbool(const char *var, const char *value);
+
+/*
+ * Return a boolean whether to use color, where the argument 'var' is
+ * one of GIT_COLOR_UNKNOWN, GIT_COLOR_NEVER, GIT_COLOR_ALWAYS, GIT_COLOR_AUTO.
+ */
 int want_color(int var);
+
+/*
+ * Translate a Git color from 'value' into a string that the terminal can
+ * interpret and store it into 'dst'. The Git color values are of the form
+ * "foreground [background] [attr]" where fore- and background can be a color
+ * name ("red"), a RGB code (#0xFF0000) or a 256-color-mode from the terminal.
+ */
 int color_parse(const char *value, char *dst);
 int color_parse_mem(const char *value, int len, char *dst);
+
+/*
+ * Output the formatted string in the specified color (and then reset to normal
+ * color so subsequent output is uncolored). Omits the color encapsulation if
+ * `color` is NULL. The `color_fprintf_ln` prints a new line after resetting
+ * the color.  The `color_print_strbuf` prints the contents of the given
+ * strbuf (BUG: but only up to its first NUL character).
+ */
 __attribute__((format (printf, 3, 4)))
 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
 __attribute__((format (printf, 3, 4)))
 int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb);
 
+/*
+ * Check if the given color is GIT_COLOR_NIL that means "no color selected".
+ * The caller needs to replace the color with the actual desired color.
+ */
 int color_is_nil(const char *color);
 
 #endif /* COLOR_H */
diff --git a/combine-diff.c b/combine-diff.c
index 18c74da..2ef4959 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -162,7 +162,7 @@ enum coalesce_direction { MATCH, BASE, NEW };
 
 /* Coalesce new lines into base by finding LCS */
 static struct lline *coalesce_lines(struct lline *base, int *lenbase,
-				    struct lline *new, int lennew,
+				    struct lline *newline, int lennew,
 				    unsigned long parent, long flags)
 {
 	int **lcs;
@@ -170,12 +170,12 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 	struct lline *baseend, *newend = NULL;
 	int i, j, origbaselen = *lenbase;
 
-	if (new == NULL)
+	if (newline == NULL)
 		return base;
 
 	if (base == NULL) {
 		*lenbase = lennew;
-		return new;
+		return newline;
 	}
 
 	/*
@@ -200,7 +200,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 		directions[0][j] = NEW;
 
 	for (i = 1, baseend = base; i < origbaselen + 1; i++) {
-		for (j = 1, newend = new; j < lennew + 1; j++) {
+		for (j = 1, newend = newline; j < lennew + 1; j++) {
 			if (match_string_spaces(baseend->line, baseend->len,
 						newend->line, newend->len, flags)) {
 				lcs[i][j] = lcs[i - 1][j - 1] + 1;
@@ -241,7 +241,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 			if (lline->prev)
 				lline->prev->next = lline->next;
 			else
-				new = lline->next;
+				newline = lline->next;
 			if (lline->next)
 				lline->next->prev = lline->prev;
 
@@ -270,7 +270,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 		}
 	}
 
-	newend = new;
+	newend = newline;
 	while (newend) {
 		struct lline *lline = newend;
 		newend = newend->next;
@@ -306,7 +306,7 @@ static char *grab_blob(const struct object_id *oid, unsigned int mode,
 		*size = fill_textconv(textconv, df, &blob);
 		free_filespec(df);
 	} else {
-		blob = read_sha1_file(oid->hash, &type, size);
+		blob = read_object_file(oid, &type, size);
 		if (type != OBJ_BLOB)
 			die("object '%s' is not a blob!", oid_to_hex(oid));
 	}
@@ -915,11 +915,11 @@ static void show_combined_header(struct combine_diff_path *elem,
 			 "", elem->path, line_prefix, c_meta, c_reset);
 	printf("%s%sindex ", line_prefix, c_meta);
 	for (i = 0; i < num_parent; i++) {
-		abb = find_unique_abbrev(elem->parent[i].oid.hash,
+		abb = find_unique_abbrev(&elem->parent[i].oid,
 					 abbrev);
 		printf("%s%s", i ? "," : "", abb);
 	}
-	abb = find_unique_abbrev(elem->oid.hash, abbrev);
+	abb = find_unique_abbrev(&elem->oid, abbrev);
 	printf("..%s%s\n", abb, c_reset);
 
 	if (mode_differs) {
diff --git a/commit.c b/commit.c
index c948c8b..ca474a7 100644
--- a/commit.c
+++ b/commit.c
@@ -266,13 +266,13 @@ const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
 	if (!ret) {
 		enum object_type type;
 		unsigned long size;
-		ret = read_sha1_file(commit->object.oid.hash, &type, &size);
+		ret = read_object_file(&commit->object.oid, &type, &size);
 		if (!ret)
 			die("cannot read commit object %s",
 			    oid_to_hex(&commit->object.oid));
 		if (type != OBJ_COMMIT)
 			die("expected commit for %s, got %s",
-			    oid_to_hex(&commit->object.oid), typename(type));
+			    oid_to_hex(&commit->object.oid), type_name(type));
 		if (sizep)
 			*sizep = size;
 	}
@@ -383,7 +383,7 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)
 		return -1;
 	if (item->object.parsed)
 		return 0;
-	buffer = read_sha1_file(item->object.oid.hash, &type, &size);
+	buffer = read_object_file(&item->object.oid, &type, &size);
 	if (!buffer)
 		return quiet_on_missing ? -1 :
 			error("Could not read %s",
@@ -859,19 +859,19 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)
 	commit_list_insert(in->item, &ret);
 
 	for (i = in->next; i; i = i->next) {
-		struct commit_list *new = NULL, *end = NULL;
+		struct commit_list *new_commits = NULL, *end = NULL;
 
 		for (j = ret; j; j = j->next) {
 			struct commit_list *bases;
 			bases = get_merge_bases(i->item, j->item);
-			if (!new)
-				new = bases;
+			if (!new_commits)
+				new_commits = bases;
 			else
 				end->next = bases;
 			for (k = bases; k; k = k->next)
 				end = k;
 		}
-		ret = new;
+		ret = new_commits;
 	}
 	return ret;
 }
@@ -1206,7 +1206,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
 	desc = merge_remote_util(parent);
 	if (!desc || !desc->obj)
 		return;
-	buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
+	buf = read_object_file(&desc->obj->oid, &type, &size);
 	if (!buf || type != OBJ_TAG)
 		goto free_return;
 	len = parse_signature(buf, size);
@@ -1378,9 +1378,8 @@ void free_commit_extra_headers(struct commit_extra_header *extra)
 	}
 }
 
-int commit_tree(const char *msg, size_t msg_len,
-		const unsigned char *tree,
-		struct commit_list *parents, unsigned char *ret,
+int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
+		struct commit_list *parents, struct object_id *ret,
 		const char *author, const char *sign_commit)
 {
 	struct commit_extra_header *extra = NULL, **tail = &extra;
@@ -1509,8 +1508,8 @@ N_("Warning: commit message did not conform to UTF-8.\n"
    "variable i18n.commitencoding to the encoding your project uses.\n");
 
 int commit_tree_extended(const char *msg, size_t msg_len,
-			 const unsigned char *tree,
-			 struct commit_list *parents, unsigned char *ret,
+			 const struct object_id *tree,
+			 struct commit_list *parents, struct object_id *ret,
 			 const char *author, const char *sign_commit,
 			 struct commit_extra_header *extra)
 {
@@ -1518,7 +1517,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
 	int encoding_is_utf8;
 	struct strbuf buffer;
 
-	assert_sha1_type(tree, OBJ_TREE);
+	assert_oid_type(tree, OBJ_TREE);
 
 	if (memchr(msg, '\0', msg_len))
 		return error("a NUL byte in commit log message not allowed.");
@@ -1527,7 +1526,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
 	encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
 
 	strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
-	strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
+	strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
 
 	/*
 	 * NOTE! This ordering means that the same exact tree merged with a
@@ -1566,7 +1565,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
 		goto out;
 	}
 
-	result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
+	result = write_object_file(buffer.buf, buffer.len, commit_type, ret);
 out:
 	strbuf_release(&buffer);
 	return result;
@@ -1615,11 +1614,11 @@ struct commit *get_merge_parent(const char *name)
 struct commit_list **commit_list_append(struct commit *commit,
 					struct commit_list **next)
 {
-	struct commit_list *new = xmalloc(sizeof(struct commit_list));
-	new->item = commit;
-	*next = new;
-	new->next = NULL;
-	return &new->next;
+	struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
+	new_commit->item = commit;
+	*next = new_commit;
+	new_commit->next = NULL;
+	return &new_commit->next;
 }
 
 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
diff --git a/commit.h b/commit.h
index 425f402..0fb8271 100644
--- a/commit.h
+++ b/commit.h
@@ -262,14 +262,15 @@ extern void append_merge_tag_headers(struct commit_list *parents,
 				     struct commit_extra_header ***tail);
 
 extern int commit_tree(const char *msg, size_t msg_len,
-		       const unsigned char *tree,
-		       struct commit_list *parents, unsigned char *ret,
+		       const struct object_id *tree,
+		       struct commit_list *parents, struct object_id *ret,
 		       const char *author, const char *sign_commit);
 
 extern int commit_tree_extended(const char *msg, size_t msg_len,
-				const unsigned char *tree,
-				struct commit_list *parents, unsigned char *ret,
-				const char *author, const char *sign_commit,
+				const struct object_id *tree,
+				struct commit_list *parents,
+				struct object_id *ret, const char *author,
+				const char *sign_commit,
 				struct commit_extra_header *);
 
 extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
diff --git a/compat/mingw.c b/compat/mingw.c
index 2d44d21..a67872b 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -761,6 +761,17 @@ revert_attrs:
 	return rc;
 }
 
+#undef strftime
+size_t mingw_strftime(char *s, size_t max,
+		      const char *format, const struct tm *tm)
+{
+	size_t ret = strftime(s, max, format, tm);
+
+	if (!ret && errno == EINVAL)
+		die("invalid strftime format: '%s'", format);
+	return ret;
+}
+
 unsigned int sleep (unsigned int seconds)
 {
 	Sleep(seconds*1000);
diff --git a/compat/mingw.h b/compat/mingw.h
index e03aecf..571019d 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -361,6 +361,9 @@ int mingw_fstat(int fd, struct stat *buf);
 
 int mingw_utime(const char *file_name, const struct utimbuf *times);
 #define utime mingw_utime
+size_t mingw_strftime(char *s, size_t max,
+		   const char *format, const struct tm *tm);
+#define strftime mingw_strftime
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
 		     const char *dir,
diff --git a/config.c b/config.c
index b0c20e6..c698988 100644
--- a/config.c
+++ b/config.c
@@ -1488,7 +1488,7 @@ int git_config_from_blob_oid(config_fn_t fn,
 	unsigned long size;
 	int ret;
 
-	buf = read_sha1_file(oid->hash, &type, &size);
+	buf = read_object_file(oid, &type, &size);
 	if (!buf)
 		return error("unable to load config blob object '%s'", name);
 	if (type != OBJ_BLOB) {
diff --git a/config.mak.uname b/config.mak.uname
index 685a80d..6a1d0de 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -182,7 +182,6 @@ ifeq ($(uname_O),Cygwin)
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 	X = .exe
 	UNRELIABLE_FSTAT = UnfortunatelyYes
-	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
 	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
 	MMAP_PREVENTS_DELETE = UnfortunatelyYes
 	COMPAT_OBJS += compat/cygwin.o
diff --git a/configure.ac b/configure.ac
index 7f84151..6f1fd9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,25 +254,25 @@ GIT_PARSE_WITH([openssl]))
 # Perl-compatible regular expressions instead of standard or extended
 # POSIX regular expressions.
 #
-# Currently USE_LIBPCRE is a synonym for USE_LIBPCRE1, define
-# USE_LIBPCRE2 instead if you'd like to use version 2 of the PCRE
-# library. The USE_LIBPCRE flag will likely be changed to mean v2 by
-# default in future releases.
+# USE_LIBPCRE is a synonym for USE_LIBPCRE2, define USE_LIBPCRE1
+# instead if you'd like to use the legacy version 1 of the PCRE
+# library. Support for version 1 will likely be removed in some future
+# release of Git, as upstream has all but abandoned it.
 #
 # Define LIBPCREDIR=/foo/bar if your PCRE header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
 AC_ARG_WITH(libpcre,
-AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre1]),
+AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre2]),
     if test "$withval" = "no"; then
-	USE_LIBPCRE1=
+	USE_LIBPCRE2=
     elif test "$withval" = "yes"; then
-	USE_LIBPCRE1=YesPlease
+	USE_LIBPCRE2=YesPlease
     else
-	USE_LIBPCRE1=YesPlease
+	USE_LIBPCRE2=YesPlease
 	LIBPCREDIR=$withval
 	AC_MSG_NOTICE([Setting LIBPCREDIR to $LIBPCREDIR])
-        dnl USE_LIBPCRE1 can still be modified below, so don't substitute
+        dnl USE_LIBPCRE2 can still be modified below, so don't substitute
         dnl it yet.
 	GIT_CONF_SUBST([LIBPCREDIR])
     fi)
@@ -296,6 +296,10 @@ AS_HELP_STRING([],           [ARG can be also prefix for libpcre library and hea
 AC_ARG_WITH(libpcre2,
 AS_HELP_STRING([--with-libpcre2],[support Perl-compatible regexes via libpcre2 (default is NO)])
 AS_HELP_STRING([],           [ARG can be also prefix for libpcre library and headers]),
+    if test -n "$USE_LIBPCRE2"; then
+        AC_MSG_ERROR([Only supply one of --with-libpcre or its synonym --with-libpcre2!])
+    fi
+
     if test -n "$USE_LIBPCRE1"; then
         AC_MSG_ERROR([Only supply one of --with-libpcre1 or --with-libpcre2!])
     fi
@@ -549,8 +553,8 @@ if test -n "$USE_LIBPCRE1"; then
 GIT_STASH_FLAGS($LIBPCREDIR)
 
 AC_CHECK_LIB([pcre], [pcre_version],
-[USE_LIBPCRE=YesPlease],
-[USE_LIBPCRE=])
+[USE_LIBPCRE1=YesPlease],
+[USE_LIBPCRE1=])
 
 GIT_UNSTASH_FLAGS($LIBPCREDIR)
 
diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
index 6fe8727..e34eada 100644
--- a/contrib/coccinelle/strbuf.cocci
+++ b/contrib/coccinelle/strbuf.cocci
@@ -1,21 +1,6 @@
 @ strbuf_addf_with_format_only @
 expression E;
-constant fmt;
-@@
-  strbuf_addf(E,
-(
-  fmt
-|
-  _(fmt)
-)
-  );
-
-@ script:python @
-fmt << strbuf_addf_with_format_only.fmt;
-@@
-cocci.include_match("%" not in fmt)
-
-@ extends strbuf_addf_with_format_only @
+constant fmt !~ "%";
 @@
 - strbuf_addf
 + strbuf_addstr
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 88813e9..a757073 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -29,6 +29,8 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# Compatible with bash 3.2.57.
+#
 # You can set the following environment variables to influence the behavior of
 # the completion routines:
 #
@@ -280,6 +282,43 @@ __gitcomp ()
 	esac
 }
 
+# Clear the variables caching builtins' options when (re-)sourcing
+# the completion script.
+unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
+
+# This function is equivalent to
+#
+#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#
+# except that the output is cached. Accept 1-3 arguments:
+# 1: the git command to execute, this is also the cache key
+# 2: extra options to be added on top (e.g. negative forms)
+# 3: options to be excluded
+__gitcomp_builtin ()
+{
+	# spaces must be replaced with underscore for multi-word
+	# commands, e.g. "git remote add" becomes remote_add.
+	local cmd="$1"
+	local incl="$2"
+	local excl="$3"
+
+	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local options
+	eval "options=\$$var"
+
+	if [ -z "$options" ]; then
+		# leading and trailing spaces are significant to make
+		# option removal work correctly.
+		options=" $(__git ${cmd/_/ } --git-completion-helper) $incl "
+		for i in $excl; do
+			options="${options/ $i / }"
+		done
+		eval "$var=\"$options\""
+	fi
+
+	__gitcomp "$options"
+}
+
 # Variation of __gitcomp_nl () that appends to the existing list of
 # completion candidates, COMPREPLY.
 __gitcomp_nl_append ()
@@ -439,7 +478,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -1072,12 +1111,13 @@ __git_count_arguments ()
 }
 
 __git_whitespacelist="nowarn warn error error-all fix"
+__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "--skip --continue --resolved --abort"
+		__gitcomp "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1086,12 +1126,8 @@ _git_am ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--3way --committer-date-is-author-date --ignore-date
-			--ignore-whitespace --ignore-space-change
-			--interactive --keep --no-utf8 --signoff --utf8
-			--whitespace= --scissors
-			"
+		__gitcomp_builtin am "--no-utf8" \
+			"$__git_am_inprogress_options"
 		return
 	esac
 }
@@ -1104,14 +1140,7 @@ _git_apply ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
-			--ignore-whitespace --ignore-space-change
-			--whitespace= --inaccurate-eof --verbose
-			--recount --directory=
-			"
+		__gitcomp_builtin apply
 		return
 	esac
 }
@@ -1120,10 +1149,7 @@ _git_add ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--interactive --refresh --patch --update --dry-run
-			--ignore-errors --intent-to-add --force --edit --chmod=
-			"
+		__gitcomp_builtin add
 		return
 	esac
 
@@ -1200,12 +1226,8 @@ _git_branch ()
 		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
-		__gitcomp "
-			--color --no-color --verbose --abbrev= --no-abbrev
-			--track --no-track --contains --no-contains --merged --no-merged
-			--set-upstream-to= --edit-description --list
-			--unset-upstream --delete --move --copy --remotes
-			--column --no-column --sort= --points-at
+		__gitcomp_builtin branch "--no-color --no-abbrev
+			--no-track --no-column
 			"
 		;;
 	*)
@@ -1247,11 +1269,7 @@ _git_checkout ()
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
 		;;
 	--*)
-		__gitcomp "
-			--quiet --ours --theirs --track --no-track --merge
-			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
-			--recurse-submodules --no-recurse-submodules
-			"
+		__gitcomp_builtin checkout "--no-track --no-recurse-submodules"
 		;;
 	*)
 		# check if --track, --no-track, or --no-guess was specified
@@ -1268,19 +1286,28 @@ _git_checkout ()
 
 _git_cherry ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp_builtin cherry
+		return
+	esac
+
 	__git_complete_refs
 }
 
+__git_cherry_pick_inprogress_options="--continue --quit --abort"
+
 _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_cherry_pick_inprogress_options"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
+		__gitcomp_builtin cherry-pick "" \
+			"$__git_cherry_pick_inprogress_options"
 		;;
 	*)
 		__git_complete_refs
@@ -1292,7 +1319,7 @@ _git_clean ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run --quiet"
+		__gitcomp_builtin clean
 		return
 		;;
 	esac
@@ -1305,26 +1332,7 @@ _git_clone ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--local
-			--no-hardlinks
-			--shared
-			--reference
-			--quiet
-			--no-checkout
-			--bare
-			--mirror
-			--origin
-			--upload-pack
-			--template=
-			--depth
-			--single-branch
-			--no-tags
-			--branch
-			--recurse-submodules
-			--no-single-branch
-			--shallow-submodules
-			"
+		__gitcomp_builtin clone "--no-single-branch"
 		return
 		;;
 	esac
@@ -1357,16 +1365,7 @@ _git_commit ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --author= --signoff --verify --no-verify
-			--edit --no-edit
-			--amend --include --only --interactive
-			--dry-run --reuse-message= --reedit-message=
-			--reset-author --file= --message= --template=
-			--cleanup= --untracked-files --untracked-files=
-			--verbose --quiet --fixup= --squash=
-			--patch --short --date --allow-empty
-			"
+		__gitcomp_builtin commit "--no-edit --verify"
 		return
 	esac
 
@@ -1382,11 +1381,7 @@ _git_describe ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --tags --contains --abbrev= --candidates=
-			--exact-match --debug --long --match --always --first-parent
-			--exclude --dirty --broken
-			"
+		__gitcomp_builtin describe
 		return
 	esac
 	__git_complete_refs
@@ -1411,7 +1406,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
-			--submodule --submodule=
+			--submodule --submodule= --ignore-submodules
 "
 
 _git_diff ()
@@ -1452,11 +1447,11 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs
-			--no-renames --diff-filter= --find-copies-harder
-			--relative --ignore-submodules
-			--tool="
+		__gitcomp_builtin difftool "$__git_diff_common_options
+					--base --cached --ours --theirs
+					--pickaxe-all --pickaxe-regex
+					--relative --staged
+					"
 		return
 		;;
 	esac
@@ -1465,12 +1460,6 @@ _git_difftool ()
 
 __git_fetch_recurse_submodules="yes on-demand no"
 
-__git_fetch_options="
-	--quiet --verbose --append --upload-pack --force --keep --depth=
-	--tags --no-tags --all --prune --dry-run --recurse-submodules=
-	--unshallow --update-shallow
-"
-
 _git_fetch ()
 {
 	case "$cur" in
@@ -1479,7 +1468,7 @@ _git_fetch ()
 		return
 		;;
 	--*)
-		__gitcomp "$__git_fetch_options"
+		__gitcomp_builtin fetch "--no-tags"
 		return
 		;;
 	esac
@@ -1516,20 +1505,7 @@ _git_fsck ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--tags --root --unreachable --cache --no-reflogs --full
-			--strict --verbose --lost-found --name-objects
-			"
-		return
-		;;
-	esac
-}
-
-_git_gc ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp "--prune --aggressive"
+		__gitcomp_builtin fsck "--no-reflogs"
 		return
 		;;
 	esac
@@ -1585,21 +1561,7 @@ _git_grep ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--cached
-			--text --ignore-case --word-regexp --invert-match
-			--full-name --line-number
-			--extended-regexp --basic-regexp --fixed-strings
-			--perl-regexp
-			--threads
-			--files-with-matches --name-only
-			--files-without-match
-			--max-depth
-			--count
-			--and --or --not --all-match
-			--break --heading --show-function --function-context
-			--untracked --no-index
-			"
+		__gitcomp_builtin grep
 		return
 		;;
 	esac
@@ -1617,7 +1579,7 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --guides --info --man --web"
+		__gitcomp_builtin help
 		return
 		;;
 	esac
@@ -1640,7 +1602,7 @@ _git_init ()
 		return
 		;;
 	--*)
-		__gitcomp "--quiet --bare --template= --shared --shared="
+		__gitcomp_builtin init
 		return
 		;;
 	esac
@@ -1650,13 +1612,7 @@ _git_ls_files ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --deleted --modified --others --ignored
-			--stage --directory --no-empty-directory --unmerged
-			--killed --exclude= --exclude-from=
-			--exclude-per-directory= --exclude-standard
-			--error-unmatch --with-tree= --full-name
-			--abbrev --ignored --exclude-per-directory
-			"
+		__gitcomp_builtin ls-files "--no-empty-directory"
 		return
 		;;
 	esac
@@ -1670,7 +1626,7 @@ _git_ls_remote ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--heads --tags --refs --get-url --symref"
+		__gitcomp_builtin ls-remote
 		return
 		;;
 	esac
@@ -1679,6 +1635,13 @@ _git_ls_remote ()
 
 _git_ls_tree ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-tree
+		return
+		;;
+	esac
+
 	__git_complete_file
 }
 
@@ -1794,22 +1757,18 @@ _git_log ()
 	__git_complete_revlist
 }
 
-# Common merge options shared by git-merge(1) and git-pull(1).
-__git_merge_options="
-	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
-	--verify-signatures --no-verify-signatures --gpg-sign
-	--quiet --verbose --progress --no-progress
-"
-
 _git_merge ()
 {
 	__git_complete_strategy && return
 
 	case "$cur" in
 	--*)
-		__gitcomp "$__git_merge_options
-			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
+		__gitcomp_builtin merge "--no-rerere-autoupdate
+				--no-commit --no-edit --no-ff
+				--no-log --no-progress
+				--no-squash --no-stat
+				--no-verify-signatures
+				"
 		return
 	esac
 	__git_complete_refs
@@ -1833,7 +1792,7 @@ _git_merge_base ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		__gitcomp_builtin merge-base
 		return
 		;;
 	esac
@@ -1844,7 +1803,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin mv
 		return
 		;;
 	esac
@@ -1858,19 +1817,14 @@ _git_mv ()
 	fi
 }
 
-_git_name_rev ()
-{
-	__gitcomp "--tags --all --stdin"
-}
-
 _git_notes ()
 {
-	local subcommands='add append copy edit list prune remove show'
+	local subcommands='add append copy edit get-ref list merge prune remove show'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
 	case "$subcommand,$cur" in
 	,--*)
-		__gitcomp '--ref'
+		__gitcomp_builtin notes
 		;;
 	,*)
 		case "$prev" in
@@ -1882,21 +1836,14 @@ _git_notes ()
 			;;
 		esac
 		;;
-	add,--reuse-message=*|append,--reuse-message=*|\
-	add,--reedit-message=*|append,--reedit-message=*)
+	*,--reuse-message=*|*,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
-	add,--*|append,--*)
-		__gitcomp '--file= --message= --reedit-message=
-				--reuse-message='
+	*,--*)
+		__gitcomp_builtin notes_$subcommand
 		;;
-	copy,--*)
-		__gitcomp '--stdin'
-		;;
-	prune,--*)
-		__gitcomp '--dry-run --verbose'
-		;;
-	prune,*)
+	prune,*|get-ref,*)
+		# this command does not take a ref, do not complete it
 		;;
 	*)
 		case "$prev" in
@@ -1920,12 +1867,11 @@ _git_pull ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--rebase --no-rebase
-			--autostash --no-autostash
-			$__git_merge_options
-			$__git_fetch_options
-		"
+		__gitcomp_builtin pull "--no-autostash --no-commit --no-edit
+					--no-ff --no-log --no-progress --no-rebase
+					--no-squash --no-stat --no-tags
+					--no-verify-signatures"
+
 		return
 		;;
 	esac
@@ -1976,12 +1922,7 @@ _git_push ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --mirror --tags --dry-run --force --verbose
-			--quiet --prune --delete --follow-tags
-			--receive-pack= --repo= --set-upstream
-			--force-with-lease --force-with-lease= --recurse-submodules=
-		"
+		__gitcomp_builtin push
 		return
 		;;
 	esac
@@ -1992,11 +1933,11 @@ _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo"
+		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit"
+		__gitcomp "--continue --skip --abort --quit --show-current-patch"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2016,6 +1957,7 @@ _git_rebase ()
 			--autostash --no-autostash
 			--verify --no-verify
 			--keep-empty --root --force-rebase --no-ff
+			--rerere-autoupdate
 			--exec
 			"
 
@@ -2081,7 +2023,7 @@ _git_send_email ()
 			--compose --confirm= --dry-run --envelope-sender
 			--from --identity
 			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet
+			--no-suppress-from --no-thread --quiet --reply-to
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
@@ -2119,11 +2061,7 @@ _git_status ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--short --branch --porcelain --long --verbose
-			--untracked-files= --ignore-submodules= --ignored
-			--column= --no-column
-			"
+		__gitcomp_builtin status "--no-column"
 		return
 		;;
 	esac
@@ -2265,14 +2203,7 @@ _git_config ()
 	esac
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--system --global --local --file=
-			--list --replace-all
-			--get --get-all --get-regexp
-			--add --unset --unset-all
-			--remove-section --rename-section
-			--name-only
-			"
+		__gitcomp_builtin config
 		return
 		;;
 	branch.*.*)
@@ -2672,7 +2603,7 @@ _git_remote ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--verbose"
+			__gitcomp_builtin remote
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2683,33 +2614,33 @@ _git_remote ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
+		__gitcomp_builtin remote_add "--no-tags"
 		;;
 	add,*)
 		;;
 	set-head,--*)
-		__gitcomp "--auto --delete"
+		__gitcomp_builtin remote_set-head
 		;;
 	set-branches,--*)
-		__gitcomp "--add"
+		__gitcomp_builtin remote_set-branches
 		;;
 	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
 	update,--*)
-		__gitcomp "--prune"
+		__gitcomp_builtin remote_update
 		;;
 	update,*)
 		__gitcomp "$(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
-		__gitcomp "--push --add --delete"
+		__gitcomp_builtin remote_set-url
 		;;
 	get-url,--*)
-		__gitcomp "--push --all"
+		__gitcomp_builtin remote_get-url
 		;;
 	prune,--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin remote_prune
 		;;
 	*)
 		__gitcomp_nl "$(__git_remotes)"
@@ -2721,7 +2652,7 @@ _git_replace ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --graft --format= --list --delete"
+		__gitcomp_builtin replace
 		return
 		;;
 	esac
@@ -2745,26 +2676,26 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "--merge --mixed --hard --soft --patch --keep"
+		__gitcomp_builtin reset
 		return
 		;;
 	esac
 	__git_complete_refs
 }
 
+__git_revert_inprogress_options="--continue --quit --abort"
+
 _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_revert_inprogress_options"
 		return
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--edit --mainline --no-edit --no-commit --signoff
-			--strategy= --strategy-option=
-			"
+		__gitcomp_builtin revert "--no-edit" \
+			"$__git_revert_inprogress_options"
 		return
 		;;
 	esac
@@ -2775,7 +2706,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		__gitcomp_builtin rm
 		return
 		;;
 	esac
@@ -2833,12 +2764,7 @@ _git_show_branch ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --remotes --topo-order --date-order --current --more=
-			--list --independent --merge-base --no-name
-			--color --no-color
-			--sha1-name --sparse --topics --reflog
-			"
+		__gitcomp_builtin show-branch "--no-color"
 		return
 		;;
 	esac
@@ -3045,7 +2971,7 @@ _git_tag ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-v)
+		-d|--delete|-v|--verify)
 			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
@@ -3071,11 +2997,7 @@ _git_tag ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--list --delete --verify --annotate --message --file
-			--sign --cleanup --local-user --force --column --sort=
-			--contains --no-contains --points-at --merged --no-merged --create-reflog
-			"
+		__gitcomp_builtin tag
 		;;
 	esac
 }
@@ -3087,23 +3009,26 @@ _git_whatchanged ()
 
 _git_worktree ()
 {
-	local subcommands="add list lock prune unlock"
+	local subcommands="add list lock move prune remove unlock"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 	else
 		case "$subcommand,$cur" in
 		add,--*)
-			__gitcomp "--detach"
+			__gitcomp_builtin worktree_add
 			;;
 		list,--*)
-			__gitcomp "--porcelain"
+			__gitcomp_builtin worktree_list
 			;;
 		lock,--*)
-			__gitcomp "--reason"
+			__gitcomp_builtin worktree_lock
 			;;
 		prune,--*)
-			__gitcomp "--dry-run --expire --verbose"
+			__gitcomp_builtin worktree_prune
+			;;
+		remove,--*)
+			__gitcomp "--force"
 			;;
 		*)
 			;;
@@ -3111,6 +3036,45 @@ _git_worktree ()
 	fi
 }
 
+__git_complete_common () {
+	local command="$1"
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin "$command"
+		;;
+	esac
+}
+
+__git_cmds_with_parseopt_helper=
+__git_support_parseopt_helper () {
+	test -n "$__git_cmds_with_parseopt_helper" ||
+		__git_cmds_with_parseopt_helper="$(__git --list-parseopt-builtins)"
+
+	case " $__git_cmds_with_parseopt_helper " in
+	*" $1 "*)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+__git_complete_command () {
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if declare -f $completion_func >/dev/null 2>/dev/null; then
+		$completion_func
+		return 0
+	elif __git_support_parseopt_helper "$command"; then
+		__git_complete_common "$command"
+		return 0
+	else
+		return 1
+	fi
+}
+
 __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
@@ -3170,14 +3134,12 @@ __git_main ()
 		return
 	fi
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm
index 663992e..5367545 100644
--- a/contrib/diff-highlight/DiffHighlight.pm
+++ b/contrib/diff-highlight/DiffHighlight.pm
@@ -21,37 +21,82 @@ my $RESET = "\x1b[m";
 my $COLOR = qr/\x1b\[[0-9;]*m/;
 my $BORING = qr/$COLOR|\s/;
 
-# The patch portion of git log -p --graph should only ever have preceding | and
-# not / or \ as merge history only shows up on the commit line.
-my $GRAPH = qr/$COLOR?\|$COLOR?\s+/;
-
 my @removed;
 my @added;
 my $in_hunk;
+my $graph_indent = 0;
 
 our $line_cb = sub { print @_ };
 our $flush_cb = sub { local $| = 1 };
 
-sub handle_line {
+# Count the visible width of a string, excluding any terminal color sequences.
+sub visible_width {
 	local $_ = shift;
+	my $ret = 0;
+	while (length) {
+		if (s/^$COLOR//) {
+			# skip colors
+		} elsif (s/^.//) {
+			$ret++;
+		}
+	}
+	return $ret;
+}
+
+# Return a substring of $str, omitting $len visible characters from the
+# beginning, where terminal color sequences do not count as visible.
+sub visible_substr {
+	my ($str, $len) = @_;
+	while ($len > 0) {
+		if ($str =~ s/^$COLOR//) {
+			next
+		}
+		$str =~ s/^.//;
+		$len--;
+	}
+	return $str;
+}
+
+sub handle_line {
+	my $orig = shift;
+	local $_ = $orig;
+
+	# match a graph line that begins a commit
+	if (/^(?:$COLOR?\|$COLOR?[ ])* # zero or more leading "|" with space
+	         $COLOR?\*$COLOR?[ ]   # a "*" with its trailing space
+	      (?:$COLOR?\|$COLOR?[ ])* # zero or more trailing "|"
+	                         [ ]*  # trailing whitespace for merges
+	    /x) {
+	        my $graph_prefix = $&;
+
+		# We must flush before setting graph indent, since the
+		# new commit may be indented differently from what we
+		# queued.
+		flush();
+		$graph_indent = visible_width($graph_prefix);
+
+	} elsif ($graph_indent) {
+		if (length($_) < $graph_indent) {
+			$graph_indent = 0;
+		} else {
+			$_ = visible_substr($_, $graph_indent);
+		}
+	}
 
 	if (!$in_hunk) {
-		$line_cb->($_);
-		$in_hunk = /^$GRAPH*$COLOR*\@\@ /;
+		$line_cb->($orig);
+		$in_hunk = /^$COLOR*\@\@ /;
 	}
-	elsif (/^$GRAPH*$COLOR*-/) {
-		push @removed, $_;
+	elsif (/^$COLOR*-/) {
+		push @removed, $orig;
 	}
-	elsif (/^$GRAPH*$COLOR*\+/) {
-		push @added, $_;
+	elsif (/^$COLOR*\+/) {
+		push @added, $orig;
 	}
 	else {
-		show_hunk(\@removed, \@added);
-		@removed = ();
-		@added = ();
-
-		$line_cb->($_);
-		$in_hunk = /^$GRAPH*$COLOR*[\@ ]/;
+		flush();
+		$line_cb->($orig);
+		$in_hunk = /^$COLOR*[\@ ]/;
 	}
 
 	# Most of the time there is enough output to keep things streaming,
@@ -71,6 +116,8 @@ sub flush {
 	# Flush any queued hunk (this can happen when there is no trailing
 	# context in the final diff of the input).
 	show_hunk(\@removed, \@added);
+	@removed = ();
+	@added = ();
 }
 
 sub highlight_stdin {
@@ -226,8 +273,8 @@ sub is_pair_interesting {
 	my $suffix_a = join('', @$a[($sa+1)..$#$a]);
 	my $suffix_b = join('', @$b[($sb+1)..$#$b]);
 
-	return $prefix_a !~ /^$GRAPH*$COLOR*-$BORING*$/ ||
-	       $prefix_b !~ /^$GRAPH*$COLOR*\+$BORING*$/ ||
+	return visible_substr($prefix_a, $graph_indent) !~ /^$COLOR*-$BORING*$/ ||
+	       visible_substr($prefix_b, $graph_indent) !~ /^$COLOR*\+$BORING*$/ ||
 	       $suffix_a !~ /^$BORING*$/ ||
 	       $suffix_b !~ /^$BORING*$/;
 }
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 3b43dbe..f6f5195 100755
--- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -52,15 +52,17 @@ test_strip_patch_header () {
 # dh_test_setup_history generates a contrived graph such that we have at least
 # 1 nesting (E) and 2 nestings (F).
 #
-#	      A branch
-#	     /
-#	D---E---F master
+#	  A---B master
+#	 /
+#	D---E---F branch
 #
 #	git log --all --graph
 #	* commit
-#	|    A
+#	|    B
 #	| * commit
 #	| |    F
+#	* | commit
+#	| |    A
 #	| * commit
 #	|/
 #	|    E
@@ -68,24 +70,30 @@ test_strip_patch_header () {
 #	     D
 #
 dh_test_setup_history () {
-	echo "file1" >file1 &&
-	echo "file2" >file2 &&
-	echo "file3" >file3 &&
-
-	cat file1 >file &&
+	echo file1 >file &&
 	git add file &&
+	test_tick &&
 	git commit -m "D" &&
 
 	git checkout -b branch &&
-	cat file2 >file &&
-	git commit -a -m "A" &&
+	echo file2 >file &&
+	test_tick &&
+	git commit -a -m "E" &&
 
 	git checkout master &&
-	cat file2 >file &&
-	git commit -a -m "E" &&
+	echo file2 >file &&
+	test_tick &&
+	git commit -a -m "A" &&
 
-	cat file3 >file &&
-	git commit -a -m "F"
+	git checkout branch &&
+	echo file3 >file &&
+	test_tick &&
+	git commit -a -m "F" &&
+
+	git checkout master &&
+	echo file3 >file &&
+	test_tick &&
+	git commit -a -m "B"
 }
 
 left_trim () {
@@ -246,16 +254,25 @@ test_expect_failure 'diff-highlight treats combining code points as a unit' '
 test_expect_success 'diff-highlight works with the --graph option' '
 	dh_test_setup_history &&
 
-	# topo-order so that the order of the commits is the same as with --graph
+	# date-order so that the commits are interleaved for both
 	# trim graph elements so we can do a diff
 	# trim leading space because our trim_graph is not perfect
-	git log --branches -p --topo-order |
+	git log --branches -p --date-order |
 		"$DIFF_HIGHLIGHT" | left_trim >graph.exp &&
-	git log --branches -p --graph |
+	git log --branches -p --date-order --graph |
 		"$DIFF_HIGHLIGHT" | trim_graph | left_trim >graph.act &&
 	test_cmp graph.exp graph.act
 '
 
+# Just reuse the previous graph test, but with --color.  Our trimming
+# doesn't know about color, so just sanity check that something got
+# highlighted.
+test_expect_success 'diff-highlight works with color graph' '
+	git log --branches -p --date-order --graph --color |
+		"$DIFF_HIGHLIGHT" | trim_graph | left_trim >graph &&
+	grep "\[7m" graph
+'
+
 # Most combined diffs won't meet diff-highlight's line-number filter. So we
 # create one here where one side drops a line and the other modifies it. That
 # should result in a diff like:
@@ -293,4 +310,32 @@ test_expect_success 'diff-highlight ignores combined diffs' '
 	test_cmp expect actual
 '
 
+test_expect_success 'diff-highlight handles --graph with leading dash' '
+	cat >file <<-\EOF &&
+	before
+	the old line
+	-leading dash
+	EOF
+	git add file &&
+	git commit -m before &&
+
+	sed s/old/new/ <file >file.tmp &&
+	mv file.tmp file &&
+	git add file &&
+	git commit -m after &&
+
+	cat >expect <<-EOF &&
+	--- a/file
+	+++ b/file
+	@@ -1,3 +1,3 @@
+	 before
+	-the ${CW}old${CR} line
+	+the ${CW}new${CR} line
+	 -leading dash
+	EOF
+	git log --graph -p -1 | "$DIFF_HIGHLIGHT" >actual.raw &&
+	trim_graph <actual.raw | sed -n "/^---/,\$p" >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/contrib/examples/README b/contrib/examples/README
index 6946f3d..18bc60b 100644
--- a/contrib/examples/README
+++ b/contrib/examples/README
@@ -1,3 +1,20 @@
-These are original scripted implementations, kept primarily for their
-reference value to any aspiring plumbing users who want to learn how
-pieces can be fit together.
+This directory used to contain scripted implementations of builtins
+that have since been rewritten in C.
+
+They have now been removed, but can be retrieved from an older commit
+that removed them from this directory.
+
+They're interesting for their reference value to any aspiring plumbing
+users who want to learn how pieces can be fit together, but in many
+cases have drifted enough from the actual implementations Git uses to
+be instructive.
+
+Other things that can be useful:
+
+ * Some commands such as git-gc wrap other commands, and what they're
+   doing behind the scenes can be seen by running them under
+   GIT_TRACE=1
+
+ * Doing `git log` on paths matching '*--helper.c' will show
+   incremental effort in the direction of moving existing shell
+   scripts to C.
diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c
deleted file mode 100644
index a3eb19d..0000000
--- a/contrib/examples/builtin-fetch--tool.c
+++ /dev/null
@@ -1,575 +0,0 @@
-#include "builtin.h"
-#include "cache.h"
-#include "refs.h"
-#include "commit.h"
-#include "sigchain.h"
-
-static char *get_stdin(void)
-{
-	struct strbuf buf = STRBUF_INIT;
-	if (strbuf_read(&buf, 0, 1024) < 0) {
-		die_errno("error reading standard input");
-	}
-	return strbuf_detach(&buf, NULL);
-}
-
-static void show_new(enum object_type type, unsigned char *sha1_new)
-{
-	fprintf(stderr, "  %s: %s\n", typename(type),
-		find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
-}
-
-static int update_ref_env(const char *action,
-		      const char *refname,
-		      unsigned char *sha1,
-		      unsigned char *oldval)
-{
-	char msg[1024];
-	const char *rla = getenv("GIT_REFLOG_ACTION");
-
-	if (!rla)
-		rla = "(reflog update)";
-	if (snprintf(msg, sizeof(msg), "%s: %s", rla, action) >= sizeof(msg))
-		warning("reflog message too long: %.*s...", 50, msg);
-	return update_ref(msg, refname, sha1, oldval, 0,
-			  UPDATE_REFS_QUIET_ON_ERR);
-}
-
-static int update_local_ref(const char *name,
-			    const char *new_head,
-			    const char *note,
-			    int verbose, int force)
-{
-	unsigned char sha1_old[20], sha1_new[20];
-	char oldh[41], newh[41];
-	struct commit *current, *updated;
-	enum object_type type;
-
-	if (get_sha1_hex(new_head, sha1_new))
-		die("malformed object name %s", new_head);
-
-	type = sha1_object_info(sha1_new, NULL);
-	if (type < 0)
-		die("object %s not found", new_head);
-
-	if (!*name) {
-		/* Not storing */
-		if (verbose) {
-			fprintf(stderr, "* fetched %s\n", note);
-			show_new(type, sha1_new);
-		}
-		return 0;
-	}
-
-	if (get_sha1(name, sha1_old)) {
-		const char *msg;
-	just_store:
-		/* new ref */
-		if (!strncmp(name, "refs/tags/", 10))
-			msg = "storing tag";
-		else
-			msg = "storing head";
-		fprintf(stderr, "* %s: storing %s\n",
-			name, note);
-		show_new(type, sha1_new);
-		return update_ref_env(msg, name, sha1_new, NULL);
-	}
-
-	if (!hashcmp(sha1_old, sha1_new)) {
-		if (verbose) {
-			fprintf(stderr, "* %s: same as %s\n", name, note);
-			show_new(type, sha1_new);
-		}
-		return 0;
-	}
-
-	if (!strncmp(name, "refs/tags/", 10)) {
-		fprintf(stderr, "* %s: updating with %s\n", name, note);
-		show_new(type, sha1_new);
-		return update_ref_env("updating tag", name, sha1_new, NULL);
-	}
-
-	current = lookup_commit_reference(sha1_old);
-	updated = lookup_commit_reference(sha1_new);
-	if (!current || !updated)
-		goto just_store;
-
-	strcpy(oldh, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
-	strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
-
-	if (in_merge_bases(current, updated)) {
-		fprintf(stderr, "* %s: fast-forward to %s\n",
-			name, note);
-		fprintf(stderr, "  old..new: %s..%s\n", oldh, newh);
-		return update_ref_env("fast-forward", name, sha1_new, sha1_old);
-	}
-	if (!force) {
-		fprintf(stderr,
-			"* %s: not updating to non-fast-forward %s\n",
-			name, note);
-		fprintf(stderr,
-			"  old...new: %s...%s\n", oldh, newh);
-		return 1;
-	}
-	fprintf(stderr,
-		"* %s: forcing update to non-fast-forward %s\n",
-		name, note);
-	fprintf(stderr, "  old...new: %s...%s\n", oldh, newh);
-	return update_ref_env("forced-update", name, sha1_new, sha1_old);
-}
-
-static int append_fetch_head(FILE *fp,
-			     const char *head, const char *remote,
-			     const char *remote_name, const char *remote_nick,
-			     const char *local_name, int not_for_merge,
-			     int verbose, int force)
-{
-	struct commit *commit;
-	int remote_len, i, note_len;
-	unsigned char sha1[20];
-	char note[1024];
-	const char *what, *kind;
-
-	if (get_sha1(head, sha1))
-		return error("Not a valid object name: %s", head);
-	commit = lookup_commit_reference_gently(sha1, 1);
-	if (!commit)
-		not_for_merge = 1;
-
-	if (!strcmp(remote_name, "HEAD")) {
-		kind = "";
-		what = "";
-	}
-	else if (!strncmp(remote_name, "refs/heads/", 11)) {
-		kind = "branch";
-		what = remote_name + 11;
-	}
-	else if (!strncmp(remote_name, "refs/tags/", 10)) {
-		kind = "tag";
-		what = remote_name + 10;
-	}
-	else if (!strncmp(remote_name, "refs/remotes/", 13)) {
-		kind = "remote-tracking branch";
-		what = remote_name + 13;
-	}
-	else {
-		kind = "";
-		what = remote_name;
-	}
-
-	remote_len = strlen(remote);
-	for (i = remote_len - 1; remote[i] == '/' && 0 <= i; i--)
-		;
-	remote_len = i + 1;
-	if (4 < i && !strncmp(".git", remote + i - 3, 4))
-		remote_len = i - 3;
-
-	note_len = 0;
-	if (*what) {
-		if (*kind)
-			note_len += sprintf(note + note_len, "%s ", kind);
-		note_len += sprintf(note + note_len, "'%s' of ", what);
-	}
-	note_len += sprintf(note + note_len, "%.*s", remote_len, remote);
-	fprintf(fp, "%s\t%s\t%s\n",
-		sha1_to_hex(commit ? commit->object.sha1 : sha1),
-		not_for_merge ? "not-for-merge" : "",
-		note);
-	return update_local_ref(local_name, head, note, verbose, force);
-}
-
-static char *keep;
-static void remove_keep(void)
-{
-	if (keep && *keep)
-		unlink(keep);
-}
-
-static void remove_keep_on_signal(int signo)
-{
-	remove_keep();
-	sigchain_pop(signo);
-	raise(signo);
-}
-
-static char *find_local_name(const char *remote_name, const char *refs,
-			     int *force_p, int *not_for_merge_p)
-{
-	const char *ref = refs;
-	int len = strlen(remote_name);
-
-	while (ref) {
-		const char *next;
-		int single_force, not_for_merge;
-
-		while (*ref == '\n')
-			ref++;
-		if (!*ref)
-			break;
-		next = strchr(ref, '\n');
-
-		single_force = not_for_merge = 0;
-		if (*ref == '+') {
-			single_force = 1;
-			ref++;
-		}
-		if (*ref == '.') {
-			not_for_merge = 1;
-			ref++;
-			if (*ref == '+') {
-				single_force = 1;
-				ref++;
-			}
-		}
-		if (!strncmp(remote_name, ref, len) && ref[len] == ':') {
-			const char *local_part = ref + len + 1;
-			int retlen;
-
-			if (!next)
-				retlen = strlen(local_part);
-			else
-				retlen = next - local_part;
-			*force_p = single_force;
-			*not_for_merge_p = not_for_merge;
-			return xmemdupz(local_part, retlen);
-		}
-		ref = next;
-	}
-	return NULL;
-}
-
-static int fetch_native_store(FILE *fp,
-			      const char *remote,
-			      const char *remote_nick,
-			      const char *refs,
-			      int verbose, int force)
-{
-	char buffer[1024];
-	int err = 0;
-
-	sigchain_push_common(remove_keep_on_signal);
-	atexit(remove_keep);
-
-	while (fgets(buffer, sizeof(buffer), stdin)) {
-		int len;
-		char *cp;
-		char *local_name;
-		int single_force, not_for_merge;
-
-		for (cp = buffer; *cp && !isspace(*cp); cp++)
-			;
-		if (*cp)
-			*cp++ = 0;
-		len = strlen(cp);
-		if (len && cp[len-1] == '\n')
-			cp[--len] = 0;
-		if (!strcmp(buffer, "failed"))
-			die("Fetch failure: %s", remote);
-		if (!strcmp(buffer, "pack"))
-			continue;
-		if (!strcmp(buffer, "keep")) {
-			char *od = get_object_directory();
-			int len = strlen(od) + strlen(cp) + 50;
-			keep = xmalloc(len);
-			sprintf(keep, "%s/pack/pack-%s.keep", od, cp);
-			continue;
-		}
-
-		local_name = find_local_name(cp, refs,
-					     &single_force, &not_for_merge);
-		if (!local_name)
-			continue;
-		err |= append_fetch_head(fp,
-					 buffer, remote, cp, remote_nick,
-					 local_name, not_for_merge,
-					 verbose, force || single_force);
-	}
-	return err;
-}
-
-static int parse_reflist(const char *reflist)
-{
-	const char *ref;
-
-	printf("refs='");
-	for (ref = reflist; ref; ) {
-		const char *next;
-		while (*ref && isspace(*ref))
-			ref++;
-		if (!*ref)
-			break;
-		for (next = ref; *next && !isspace(*next); next++)
-			;
-		printf("\n%.*s", (int)(next - ref), ref);
-		ref = next;
-	}
-	printf("'\n");
-
-	printf("rref='");
-	for (ref = reflist; ref; ) {
-		const char *next, *colon;
-		while (*ref && isspace(*ref))
-			ref++;
-		if (!*ref)
-			break;
-		for (next = ref; *next && !isspace(*next); next++)
-			;
-		if (*ref == '.')
-			ref++;
-		if (*ref == '+')
-			ref++;
-		colon = strchr(ref, ':');
-		putchar('\n');
-		printf("%.*s", (int)((colon ? colon : next) - ref), ref);
-		ref = next;
-	}
-	printf("'\n");
-	return 0;
-}
-
-static int expand_refs_wildcard(const char *ls_remote_result, int numrefs,
-				const char **refs)
-{
-	int i, matchlen, replacelen;
-	int found_one = 0;
-	const char *remote = *refs++;
-	numrefs--;
-
-	if (numrefs == 0) {
-		fprintf(stderr, "Nothing specified for fetching with remote.%s.fetch\n",
-			remote);
-		printf("empty\n");
-	}
-
-	for (i = 0; i < numrefs; i++) {
-		const char *ref = refs[i];
-		const char *lref = ref;
-		const char *colon;
-		const char *tail;
-		const char *ls;
-		const char *next;
-
-		if (*lref == '+')
-			lref++;
-		colon = strchr(lref, ':');
-		tail = lref + strlen(lref);
-		if (!(colon &&
-		      2 < colon - lref &&
-		      colon[-1] == '*' &&
-		      colon[-2] == '/' &&
-		      2 < tail - (colon + 1) &&
-		      tail[-1] == '*' &&
-		      tail[-2] == '/')) {
-			/* not a glob */
-			if (!found_one++)
-				printf("explicit\n");
-			printf("%s\n", ref);
-			continue;
-		}
-
-		/* glob */
-		if (!found_one++)
-			printf("glob\n");
-
-		/* lref to colon-2 is remote hierarchy name;
-		 * colon+1 to tail-2 is local.
-		 */
-		matchlen = (colon-1) - lref;
-		replacelen = (tail-1) - (colon+1);
-		for (ls = ls_remote_result; ls; ls = next) {
-			const char *eol;
-			unsigned char sha1[20];
-			int namelen;
-
-			while (*ls && isspace(*ls))
-				ls++;
-			next = strchr(ls, '\n');
-			eol = !next ? (ls + strlen(ls)) : next;
-			if (!memcmp("^{}", eol-3, 3))
-				continue;
-			if (eol - ls < 40)
-				continue;
-			if (get_sha1_hex(ls, sha1))
-				continue;
-			ls += 40;
-			while (ls < eol && isspace(*ls))
-				ls++;
-			/* ls to next (or eol) is the name.
-			 * is it identical to lref to colon-2?
-			 */
-			if ((eol - ls) <= matchlen ||
-			    strncmp(ls, lref, matchlen))
-				continue;
-
-			/* Yes, it is a match */
-			namelen = eol - ls;
-			if (lref != ref)
-				putchar('+');
-			printf("%.*s:%.*s%.*s\n",
-			       namelen, ls,
-			       replacelen, colon + 1,
-			       namelen - matchlen, ls + matchlen);
-		}
-	}
-	return 0;
-}
-
-static int pick_rref(int sha1_only, const char *rref, const char *ls_remote_result)
-{
-	int err = 0;
-	int lrr_count = lrr_count, i, pass;
-	const char *cp;
-	struct lrr {
-		const char *line;
-		const char *name;
-		int namelen;
-		int shown;
-	} *lrr_list = lrr_list;
-
-	for (pass = 0; pass < 2; pass++) {
-		/* pass 0 counts and allocates, pass 1 fills... */
-		cp = ls_remote_result;
-		i = 0;
-		while (1) {
-			const char *np;
-			while (*cp && isspace(*cp))
-				cp++;
-			if (!*cp)
-				break;
-			np = strchrnul(cp, '\n');
-			if (pass) {
-				lrr_list[i].line = cp;
-				lrr_list[i].name = cp + 41;
-				lrr_list[i].namelen = np - (cp + 41);
-			}
-			i++;
-			cp = np;
-		}
-		if (!pass) {
-			lrr_count = i;
-			lrr_list = xcalloc(lrr_count, sizeof(*lrr_list));
-		}
-	}
-
-	while (1) {
-		const char *next;
-		int rreflen;
-		int i;
-
-		while (*rref && isspace(*rref))
-			rref++;
-		if (!*rref)
-			break;
-		next = strchrnul(rref, '\n');
-		rreflen = next - rref;
-
-		for (i = 0; i < lrr_count; i++) {
-			struct lrr *lrr = &(lrr_list[i]);
-
-			if (rreflen == lrr->namelen &&
-			    !memcmp(lrr->name, rref, rreflen)) {
-				if (!lrr->shown)
-					printf("%.*s\n",
-					       sha1_only ? 40 : lrr->namelen + 41,
-					       lrr->line);
-				lrr->shown = 1;
-				break;
-			}
-		}
-		if (lrr_count <= i) {
-			error("pick-rref: %.*s not found", rreflen, rref);
-			err = 1;
-		}
-		rref = next;
-	}
-	free(lrr_list);
-	return err;
-}
-
-int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
-{
-	int verbose = 0;
-	int force = 0;
-	int sopt = 0;
-
-	while (1 < argc) {
-		const char *arg = argv[1];
-		if (!strcmp("-v", arg))
-			verbose = 1;
-		else if (!strcmp("-f", arg))
-			force = 1;
-		else if (!strcmp("-s", arg))
-			sopt = 1;
-		else
-			break;
-		argc--;
-		argv++;
-	}
-
-	if (argc <= 1)
-		return error("Missing subcommand");
-
-	if (!strcmp("append-fetch-head", argv[1])) {
-		int result;
-		FILE *fp;
-		char *filename;
-
-		if (argc != 8)
-			return error("append-fetch-head takes 6 args");
-		filename = git_path_fetch_head();
-		fp = fopen(filename, "a");
-		if (!fp)
-			return error("cannot open %s: %s", filename, strerror(errno));
-		result = append_fetch_head(fp, argv[2], argv[3],
-					   argv[4], argv[5],
-					   argv[6], !!argv[7][0],
-					   verbose, force);
-		fclose(fp);
-		return result;
-	}
-	if (!strcmp("native-store", argv[1])) {
-		int result;
-		FILE *fp;
-		char *filename;
-
-		if (argc != 5)
-			return error("fetch-native-store takes 3 args");
-		filename = git_path_fetch_head();
-		fp = fopen(filename, "a");
-		if (!fp)
-			return error("cannot open %s: %s", filename, strerror(errno));
-		result = fetch_native_store(fp, argv[2], argv[3], argv[4],
-					    verbose, force);
-		fclose(fp);
-		return result;
-	}
-	if (!strcmp("parse-reflist", argv[1])) {
-		const char *reflist;
-		if (argc != 3)
-			return error("parse-reflist takes 1 arg");
-		reflist = argv[2];
-		if (!strcmp(reflist, "-"))
-			reflist = get_stdin();
-		return parse_reflist(reflist);
-	}
-	if (!strcmp("pick-rref", argv[1])) {
-		const char *ls_remote_result;
-		if (argc != 4)
-			return error("pick-rref takes 2 args");
-		ls_remote_result = argv[3];
-		if (!strcmp(ls_remote_result, "-"))
-			ls_remote_result = get_stdin();
-		return pick_rref(sopt, argv[2], ls_remote_result);
-	}
-	if (!strcmp("expand-refs-wildcard", argv[1])) {
-		const char *reflist;
-		if (argc < 4)
-			return error("expand-refs-wildcard takes at least 2 args");
-		reflist = argv[2];
-		if (!strcmp(reflist, "-"))
-			reflist = get_stdin();
-		return expand_refs_wildcard(reflist, argc - 3, argv + 3);
-	}
-
-	return error("Unknown subcommand: %s", argv[1]);
-}
diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh
deleted file mode 100755
index dd539f1..0000000
--- a/contrib/examples/git-am.sh
+++ /dev/null
@@ -1,975 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005, 2006 Junio C Hamano
-
-SUBDIRECTORY_OK=Yes
-OPTIONS_KEEPDASHDASH=
-OPTIONS_STUCKLONG=t
-OPTIONS_SPEC="\
-git am [options] [(<mbox>|<Maildir>)...]
-git am [options] (--continue | --skip | --abort)
---
-i,interactive   run interactively
-b,binary*       (historical option -- no-op)
-3,3way          allow fall back on 3way merging if needed
-q,quiet         be quiet
-s,signoff       add a Signed-off-by line to the commit message
-u,utf8          recode into utf8 (default)
-k,keep          pass -k flag to git-mailinfo
-keep-non-patch  pass -b flag to git-mailinfo
-m,message-id    pass -m flag to git-mailinfo
-keep-cr         pass --keep-cr flag to git-mailsplit for mbox format
-no-keep-cr      do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
-c,scissors      strip everything before a scissors line
-whitespace=     pass it through git-apply
-ignore-space-change pass it through git-apply
-ignore-whitespace pass it through git-apply
-directory=      pass it through git-apply
-exclude=        pass it through git-apply
-include=        pass it through git-apply
-C=              pass it through git-apply
-p=              pass it through git-apply
-patch-format=   format the patch(es) are in
-reject          pass it through git-apply
-resolvemsg=     override error message when patch failure occurs
-continue        continue applying patches after resolving a conflict
-r,resolved      synonyms for --continue
-skip            skip the current patch
-abort           restore the original branch and abort the patching operation.
-committer-date-is-author-date    lie about committer date
-ignore-date     use current timestamp for author date
-rerere-autoupdate update the index with reused conflict resolution if possible
-S,gpg-sign?     GPG-sign commits
-rebasing*       (internal use for git-rebase)"
-
-. git-sh-setup
-. git-sh-i18n
-prefix=$(git rev-parse --show-prefix)
-set_reflog_action am
-require_work_tree
-cd_to_toplevel
-
-git var GIT_COMMITTER_IDENT >/dev/null ||
-	die "$(gettext "You need to set your committer info first")"
-
-if git rev-parse --verify -q HEAD >/dev/null
-then
-	HAS_HEAD=yes
-else
-	HAS_HEAD=
-fi
-
-cmdline="git am"
-if test '' != "$interactive"
-then
-	cmdline="$cmdline -i"
-fi
-if test '' != "$threeway"
-then
-	cmdline="$cmdline -3"
-fi
-
-empty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-
-sq () {
-	git rev-parse --sq-quote "$@"
-}
-
-stop_here () {
-    echo "$1" >"$dotest/next"
-    git rev-parse --verify -q HEAD >"$dotest/abort-safety"
-    exit 1
-}
-
-safe_to_abort () {
-	if test -f "$dotest/dirtyindex"
-	then
-		return 1
-	fi
-
-	if ! test -f "$dotest/abort-safety"
-	then
-		return 0
-	fi
-
-	abort_safety=$(cat "$dotest/abort-safety")
-	if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety"
-	then
-		return 0
-	fi
-	gettextln "You seem to have moved HEAD since the last 'am' failure.
-Not rewinding to ORIG_HEAD" >&2
-	return 1
-}
-
-stop_here_user_resolve () {
-    if [ -n "$resolvemsg" ]; then
-	    printf '%s\n' "$resolvemsg"
-	    stop_here $1
-    fi
-    eval_gettextln "When you have resolved this problem, run \"\$cmdline --continue\".
-If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
-To restore the original branch and stop patching, run \"\$cmdline --abort\"."
-
-    stop_here $1
-}
-
-go_next () {
-	rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
-		"$dotest/patch" "$dotest/info"
-	echo "$next" >"$dotest/next"
-	this=$next
-}
-
-cannot_fallback () {
-	echo "$1"
-	gettextln "Cannot fall back to three-way merge."
-	exit 1
-}
-
-fall_back_3way () {
-    O_OBJECT=$(cd "$GIT_OBJECT_DIRECTORY" && pwd)
-
-    rm -fr "$dotest"/patch-merge-*
-    mkdir "$dotest/patch-merge-tmp-dir"
-
-    # First see if the patch records the index info that we can use.
-    cmd="git apply $git_apply_opt --build-fake-ancestor" &&
-    cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' &&
-    eval "$cmd" &&
-    GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
-    git write-tree >"$dotest/patch-merge-base+" ||
-    cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
-
-    say "$(gettext "Using index info to reconstruct a base tree...")"
-
-    cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
-
-    if test -z "$GIT_QUIET"
-    then
-	eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD"
-    fi
-
-    cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
-    if eval "$cmd"
-    then
-	mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
-	mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
-    else
-	cannot_fallback "$(gettext "Did you hand edit your patch?
-It does not apply to blobs recorded in its index.")"
-    fi
-
-    test -f "$dotest/patch-merge-index" &&
-    his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
-    orig_tree=$(cat "$dotest/patch-merge-base") &&
-    rm -fr "$dotest"/patch-merge-* || exit 1
-
-    say "$(gettext "Falling back to patching base and 3-way merge...")"
-
-    # This is not so wrong.  Depending on which base we picked,
-    # orig_tree may be wildly different from ours, but his_tree
-    # has the same set of wildly different changes in parts the
-    # patch did not touch, so recursive ends up canceling them,
-    # saying that we reverted all those changes.
-
-    eval GITHEAD_$his_tree='"$FIRSTLINE"'
-    export GITHEAD_$his_tree
-    if test -n "$GIT_QUIET"
-    then
-	    GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
-    fi
-    our_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree)
-    git-merge-recursive $orig_tree -- $our_tree $his_tree || {
-	    git rerere $allow_rerere_autoupdate
-	    die "$(gettext "Failed to merge in the changes.")"
-    }
-    unset GITHEAD_$his_tree
-}
-
-clean_abort () {
-	test $# = 0 || echo >&2 "$@"
-	rm -fr "$dotest"
-	exit 1
-}
-
-patch_format=
-
-check_patch_format () {
-	# early return if patch_format was set from the command line
-	if test -n "$patch_format"
-	then
-		return 0
-	fi
-
-	# we default to mbox format if input is from stdin and for
-	# directories
-	if test $# = 0 || test "x$1" = "x-" || test -d "$1"
-	then
-		patch_format=mbox
-		return 0
-	fi
-
-	# otherwise, check the first few non-blank lines of the first
-	# patch to try to detect its format
-	{
-		# Start from first line containing non-whitespace
-		l1=
-		while test -z "$l1"
-		do
-			read l1 || break
-		done
-		read l2
-		read l3
-		case "$l1" in
-		"From "* | "From: "*)
-			patch_format=mbox
-			;;
-		'# This series applies on GIT commit'*)
-			patch_format=stgit-series
-			;;
-		"# HG changeset patch")
-			patch_format=hg
-			;;
-		*)
-			# if the second line is empty and the third is
-			# a From, Author or Date entry, this is very
-			# likely an StGIT patch
-			case "$l2,$l3" in
-			,"From: "* | ,"Author: "* | ,"Date: "*)
-				patch_format=stgit
-				;;
-			*)
-				;;
-			esac
-			;;
-		esac
-		if test -z "$patch_format" &&
-			test -n "$l1" &&
-			test -n "$l2" &&
-			test -n "$l3"
-		then
-			# This begins with three non-empty lines.  Is this a
-			# piece of e-mail a-la RFC2822?  Grab all the headers,
-			# discarding the indented remainder of folded lines,
-			# and see if it looks like that they all begin with the
-			# header field names...
-			tr -d '\015' <"$1" |
-			sed -n -e '/^$/q' -e '/^[ 	]/d' -e p |
-			sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
-			patch_format=mbox
-		fi
-	} < "$1" || clean_abort
-}
-
-split_patches () {
-	case "$patch_format" in
-	mbox)
-		if test t = "$keepcr"
-		then
-		    keep_cr=--keep-cr
-		else
-		    keep_cr=
-		fi
-		git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
-		clean_abort
-		;;
-	stgit-series)
-		if test $# -ne 1
-		then
-			clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
-		fi
-		series_dir=$(dirname "$1")
-		series_file="$1"
-		shift
-		{
-			set x
-			while read filename
-			do
-				set "$@" "$series_dir/$filename"
-			done
-			# remove the safety x
-			shift
-			# remove the arg coming from the first-line comment
-			shift
-		} < "$series_file" || clean_abort
-		# set the patch format appropriately
-		patch_format=stgit
-		# now handle the actual StGIT patches
-		split_patches "$@"
-		;;
-	stgit)
-		this=0
-		test 0 -eq "$#" && set -- -
-		for stgit in "$@"
-		do
-			this=$(expr "$this" + 1)
-			msgnum=$(printf "%0${prec}d" $this)
-			# Perl version of StGIT parse_patch. The first nonemptyline
-			# not starting with Author, From or Date is the
-			# subject, and the body starts with the next nonempty
-			# line not starting with Author, From or Date
-			@@PERL@@ -ne 'BEGIN { $subject = 0 }
-				if ($subject > 1) { print ; }
-				elsif (/^\s+$/) { next ; }
-				elsif (/^Author:/) { s/Author/From/ ; print ;}
-				elsif (/^(From|Date)/) { print ; }
-				elsif ($subject) {
-					$subject = 2 ;
-					print "\n" ;
-					print ;
-				} else {
-					print "Subject: ", $_ ;
-					$subject = 1;
-				}
-			' -- "$stgit" >"$dotest/$msgnum" || clean_abort
-		done
-		echo "$this" > "$dotest/last"
-		this=
-		msgnum=
-		;;
-	hg)
-		this=0
-		test 0 -eq "$#" && set -- -
-		for hg in "$@"
-		do
-			this=$(( $this + 1 ))
-			msgnum=$(printf "%0${prec}d" $this)
-			# hg stores changeset metadata in #-commented lines preceding
-			# the commit message and diff(s). The only metadata we care about
-			# are the User and Date (Node ID and Parent are hashes which are
-			# only relevant to the hg repository and thus not useful to us)
-			# Since we cannot guarantee that the commit message is in
-			# git-friendly format, we put no Subject: line and just consume
-			# all of the message as the body
-			LANG=C LC_ALL=C @@PERL@@ -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
-				if ($subject) { print ; }
-				elsif (/^\# User /) { s/\# User/From:/ ; print ; }
-				elsif (/^\# Date /) {
-					my ($hashsign, $str, $time, $tz) = split ;
-					$tz_str = sprintf "%+05d", (0-$tz)/36;
-					print "Date: " .
-					      strftime("%a, %d %b %Y %H:%M:%S ",
-						       gmtime($time-$tz))
-					      . "$tz_str\n";
-				} elsif (/^\# /) { next ; }
-				else {
-					print "\n", $_ ;
-					$subject = 1;
-				}
-			' -- "$hg" >"$dotest/$msgnum" || clean_abort
-		done
-		echo "$this" >"$dotest/last"
-		this=
-		msgnum=
-		;;
-	*)
-		if test -n "$patch_format"
-		then
-			clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
-		else
-			clean_abort "$(gettext "Patch format detection failed.")"
-		fi
-		;;
-	esac
-}
-
-prec=4
-dotest="$GIT_DIR/rebase-apply"
-sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
-messageid= resolvemsg= resume= scissors= no_inbody_headers=
-git_apply_opt=
-committer_date_is_author_date=
-ignore_date=
-allow_rerere_autoupdate=
-gpg_sign_opt=
-threeway=
-
-if test "$(git config --bool --get am.messageid)" = true
-then
-    messageid=t
-fi
-
-if test "$(git config --bool --get am.keepcr)" = true
-then
-    keepcr=t
-fi
-
-while test $# != 0
-do
-	case "$1" in
-	-i|--interactive)
-		interactive=t ;;
-	-b|--binary)
-		gettextln >&2 "The -b/--binary option has been a no-op for long time, and
-it will be removed. Please do not use it anymore."
-		;;
-	-3|--3way)
-		threeway=t ;;
-	-s|--signoff)
-		sign=t ;;
-	-u|--utf8)
-		utf8=t ;; # this is now default
-	--no-utf8)
-		utf8= ;;
-	-m|--message-id)
-		messageid=t ;;
-	--no-message-id)
-		messageid=f ;;
-	-k|--keep)
-		keep=t ;;
-	--keep-non-patch)
-		keep=b ;;
-	-c|--scissors)
-		scissors=t ;;
-	--no-scissors)
-		scissors=f ;;
-	-r|--resolved|--continue)
-		resolved=t ;;
-	--skip)
-		skip=t ;;
-	--abort)
-		abort=t ;;
-	--rebasing)
-		rebasing=t threeway=t ;;
-	--resolvemsg=*)
-		resolvemsg="${1#--resolvemsg=}" ;;
-	--whitespace=*|--directory=*|--exclude=*|--include=*)
-		git_apply_opt="$git_apply_opt $(sq "$1")" ;;
-	-C*|-p*)
-		git_apply_opt="$git_apply_opt $(sq "$1")" ;;
-	--patch-format=*)
-		patch_format="${1#--patch-format=}" ;;
-	--reject|--ignore-whitespace|--ignore-space-change)
-		git_apply_opt="$git_apply_opt $1" ;;
-	--committer-date-is-author-date)
-		committer_date_is_author_date=t ;;
-	--ignore-date)
-		ignore_date=t ;;
-	--rerere-autoupdate|--no-rerere-autoupdate)
-		allow_rerere_autoupdate="$1" ;;
-	-q|--quiet)
-		GIT_QUIET=t ;;
-	--keep-cr)
-		keepcr=t ;;
-	--no-keep-cr)
-		keepcr=f ;;
-	--gpg-sign)
-		gpg_sign_opt=-S ;;
-	--gpg-sign=*)
-		gpg_sign_opt="-S${1#--gpg-sign=}" ;;
-	--)
-		shift; break ;;
-	*)
-		usage ;;
-	esac
-	shift
-done
-
-# If the dotest directory exists, but we have finished applying all the
-# patches in them, clear it out.
-if test -d "$dotest" &&
-   test -f "$dotest/last" &&
-   test -f "$dotest/next" &&
-   last=$(cat "$dotest/last") &&
-   next=$(cat "$dotest/next") &&
-   test $# != 0 &&
-   test "$next" -gt "$last"
-then
-   rm -fr "$dotest"
-fi
-
-if test -d "$dotest" && test -f "$dotest/last" && test -f "$dotest/next"
-then
-	case "$#,$skip$resolved$abort" in
-	0,*t*)
-		# Explicit resume command and we do not have file, so
-		# we are happy.
-		: ;;
-	0,)
-		# No file input but without resume parameters; catch
-		# user error to feed us a patch from standard input
-		# when there is already $dotest.  This is somewhat
-		# unreliable -- stdin could be /dev/null for example
-		# and the caller did not intend to feed us a patch but
-		# wanted to continue unattended.
-		test -t 0
-		;;
-	*)
-		false
-		;;
-	esac ||
-	die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
-	resume=yes
-
-	case "$skip,$abort" in
-	t,t)
-		die "$(gettext "Please make up your mind. --skip or --abort?")"
-		;;
-	t,)
-		git rerere clear
-		head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree) &&
-		git read-tree --reset -u $head_tree $head_tree &&
-		index_tree=$(git write-tree) &&
-		git read-tree -m -u $index_tree $head_tree
-		git read-tree -m $head_tree
-		;;
-	,t)
-		if test -f "$dotest/rebasing"
-		then
-			exec git rebase --abort
-		fi
-		git rerere clear
-		if safe_to_abort
-		then
-			head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree) &&
-			git read-tree --reset -u $head_tree $head_tree &&
-			index_tree=$(git write-tree) &&
-			orig_head=$(git rev-parse --verify -q ORIG_HEAD || echo $empty_tree) &&
-			git read-tree -m -u $index_tree $orig_head
-			if git rev-parse --verify -q ORIG_HEAD >/dev/null 2>&1
-			then
-				git reset ORIG_HEAD
-			else
-				git read-tree $empty_tree
-				curr_branch=$(git symbolic-ref HEAD 2>/dev/null) &&
-				git update-ref -d $curr_branch
-			fi
-		fi
-		rm -fr "$dotest"
-		exit ;;
-	esac
-	rm -f "$dotest/dirtyindex"
-else
-	# Possible stray $dotest directory in the independent-run
-	# case; in the --rebasing case, it is upto the caller
-	# (git-rebase--am) to take care of stray directories.
-	if test -d "$dotest" && test -z "$rebasing"
-	then
-		case "$skip,$resolved,$abort" in
-		,,t)
-			rm -fr "$dotest"
-			exit 0
-			;;
-		*)
-			die "$(eval_gettext "Stray \$dotest directory found.
-Use \"git am --abort\" to remove it.")"
-			;;
-		esac
-	fi
-
-	# Make sure we are not given --skip, --continue, or --abort
-	test "$skip$resolved$abort" = "" ||
-		die "$(gettext "Resolve operation not in progress, we are not resuming.")"
-
-	# Start afresh.
-	mkdir -p "$dotest" || exit
-
-	if test -n "$prefix" && test $# != 0
-	then
-		first=t
-		for arg
-		do
-			test -n "$first" && {
-				set x
-				first=
-			}
-			if is_absolute_path "$arg"
-			then
-				set "$@" "$arg"
-			else
-				set "$@" "$prefix$arg"
-			fi
-		done
-		shift
-	fi
-
-	check_patch_format "$@"
-
-	split_patches "$@"
-
-	# -i can and must be given when resuming; everything
-	# else is kept
-	echo " $git_apply_opt" >"$dotest/apply-opt"
-	echo "$threeway" >"$dotest/threeway"
-	echo "$sign" >"$dotest/sign"
-	echo "$utf8" >"$dotest/utf8"
-	echo "$keep" >"$dotest/keep"
-	echo "$messageid" >"$dotest/messageid"
-	echo "$scissors" >"$dotest/scissors"
-	echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
-	echo "$GIT_QUIET" >"$dotest/quiet"
-	echo 1 >"$dotest/next"
-	if test -n "$rebasing"
-	then
-		: >"$dotest/rebasing"
-	else
-		: >"$dotest/applying"
-		if test -n "$HAS_HEAD"
-		then
-			git update-ref ORIG_HEAD HEAD
-		else
-			git update-ref -d ORIG_HEAD >/dev/null 2>&1
-		fi
-	fi
-fi
-
-git update-index -q --refresh
-
-case "$resolved" in
-'')
-	case "$HAS_HEAD" in
-	'')
-		files=$(git ls-files) ;;
-	?*)
-		files=$(git diff-index --cached --name-only HEAD --) ;;
-	esac || exit
-	if test "$files"
-	then
-		test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
-		die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
-	fi
-esac
-
-# Now, decide what command line options we will give to the git
-# commands we invoke, based on the result of parsing command line
-# options and previous invocation state stored in $dotest/ files.
-
-if test "$(cat "$dotest/utf8")" = t
-then
-	utf8=-u
-else
-	utf8=-n
-fi
-keep=$(cat "$dotest/keep")
-case "$keep" in
-t)
-	keep=-k ;;
-b)
-	keep=-b ;;
-*)
-	keep= ;;
-esac
-case "$(cat "$dotest/messageid")" in
-t)
-	messageid=-m ;;
-f)
-	messageid= ;;
-esac
-case "$(cat "$dotest/scissors")" in
-t)
-	scissors=--scissors ;;
-f)
-	scissors=--no-scissors ;;
-esac
-if test "$(cat "$dotest/no_inbody_headers")" = t
-then
-	no_inbody_headers=--no-inbody-headers
-else
-	no_inbody_headers=
-fi
-if test "$(cat "$dotest/quiet")" = t
-then
-	GIT_QUIET=t
-fi
-if test "$(cat "$dotest/threeway")" = t
-then
-	threeway=t
-fi
-git_apply_opt=$(cat "$dotest/apply-opt")
-if test "$(cat "$dotest/sign")" = t
-then
-	SIGNOFF=$(git var GIT_COMMITTER_IDENT | sed -e '
-			s/>.*/>/
-			s/^/Signed-off-by: /'
-		)
-else
-	SIGNOFF=
-fi
-
-last=$(cat "$dotest/last")
-this=$(cat "$dotest/next")
-if test "$skip" = t
-then
-	this=$(expr "$this" + 1)
-	resume=
-fi
-
-while test "$this" -le "$last"
-do
-	msgnum=$(printf "%0${prec}d" $this)
-	next=$(expr "$this" + 1)
-	test -f "$dotest/$msgnum" || {
-		resume=
-		go_next
-		continue
-	}
-
-	# If we are not resuming, parse and extract the patch information
-	# into separate files:
-	#  - info records the authorship and title
-	#  - msg is the rest of commit log message
-	#  - patch is the patch body.
-	#
-	# When we are resuming, these files are either already prepared
-	# by the user, or the user can tell us to do so by --continue flag.
-	case "$resume" in
-	'')
-		if test -f "$dotest/rebasing"
-		then
-			commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
-				-e q "$dotest/$msgnum") &&
-			test "$(git cat-file -t "$commit")" = commit ||
-				stop_here $this
-			git cat-file commit "$commit" |
-			sed -e '1,/^$/d' >"$dotest/msg-clean"
-			echo "$commit" >"$dotest/original-commit"
-			get_author_ident_from_commit "$commit" >"$dotest/author-script"
-			git diff-tree --root --binary --full-index "$commit" >"$dotest/patch"
-		else
-			git mailinfo $keep $no_inbody_headers $messageid $scissors $utf8 "$dotest/msg" "$dotest/patch" \
-				<"$dotest/$msgnum" >"$dotest/info" ||
-				stop_here $this
-
-			# skip pine's internal folder data
-			sane_grep '^Author: Mail System Internal Data$' \
-				<"$dotest"/info >/dev/null &&
-				go_next && continue
-
-			test -s "$dotest/patch" || {
-				eval_gettextln "Patch is empty.  Was it split wrong?
-If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
-To restore the original branch and stop patching run \"\$cmdline --abort\"."
-				stop_here $this
-			}
-			rm -f "$dotest/original-commit" "$dotest/author-script"
-			{
-				sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
-				echo
-				cat "$dotest/msg"
-			} |
-			git stripspace > "$dotest/msg-clean"
-		fi
-		;;
-	esac
-
-	if test -f "$dotest/author-script"
-	then
-		eval $(cat "$dotest/author-script")
-	else
-		GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
-		GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
-		GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
-	fi
-
-	if test -z "$GIT_AUTHOR_EMAIL"
-	then
-		gettextln "Patch does not have a valid e-mail address."
-		stop_here $this
-	fi
-
-	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-
-	case "$resume" in
-	'')
-	    if test '' != "$SIGNOFF"
-	    then
-		LAST_SIGNED_OFF_BY=$(
-		    sed -ne '/^Signed-off-by: /p' \
-		    "$dotest/msg-clean" |
-		    sed -ne '$p'
-		)
-		ADD_SIGNOFF=$(
-		    test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
-		    test '' = "$LAST_SIGNED_OFF_BY" && echo
-		    echo "$SIGNOFF"
-		})
-	    else
-		ADD_SIGNOFF=
-	    fi
-	    {
-		if test -s "$dotest/msg-clean"
-		then
-			cat "$dotest/msg-clean"
-		fi
-		if test '' != "$ADD_SIGNOFF"
-		then
-			echo "$ADD_SIGNOFF"
-		fi
-	    } >"$dotest/final-commit"
-	    ;;
-	*)
-		case "$resolved$interactive" in
-		tt)
-			# This is used only for interactive view option.
-			git diff-index -p --cached HEAD -- >"$dotest/patch"
-			;;
-		esac
-	esac
-
-	resume=
-	if test "$interactive" = t
-	then
-	    test -t 0 ||
-	    die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
-	    action=again
-	    while test "$action" = again
-	    do
-		gettextln "Commit Body is:"
-		echo "--------------------------"
-		cat "$dotest/final-commit"
-		echo "--------------------------"
-		# TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-		# in your translation. The program will only accept English
-		# input at this point.
-		gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
-		read reply
-		case "$reply" in
-		[yY]*) action=yes ;;
-		[aA]*) action=yes interactive= ;;
-		[nN]*) action=skip ;;
-		[eE]*) git_editor "$dotest/final-commit"
-		       action=again ;;
-		[vV]*) action=again
-		       git_pager "$dotest/patch" ;;
-		*)     action=again ;;
-		esac
-	    done
-	else
-	    action=yes
-	fi
-
-	if test $action = skip
-	then
-		go_next
-		continue
-	fi
-
-	hook="$(git rev-parse --git-path hooks/applypatch-msg)"
-	if test -x "$hook"
-	then
-		"$hook" "$dotest/final-commit" || stop_here $this
-	fi
-
-	if test -f "$dotest/final-commit"
-	then
-		FIRSTLINE=$(sed 1q "$dotest/final-commit")
-	else
-		FIRSTLINE=""
-	fi
-
-	say "$(eval_gettext "Applying: \$FIRSTLINE")"
-
-	case "$resolved" in
-	'')
-		# When we are allowed to fall back to 3-way later, don't give
-		# false errors during the initial attempt.
-		squelch=
-		if test "$threeway" = t
-		then
-			squelch='>/dev/null 2>&1 '
-		fi
-		eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
-		apply_status=$?
-		;;
-	t)
-		# Resolved means the user did all the hard work, and
-		# we do not have to do any patch application.  Just
-		# trust what the user has in the index file and the
-		# working tree.
-		resolved=
-		git diff-index --quiet --cached HEAD -- && {
-			gettextln "No changes - did you forget to use 'git add'?
-If there is nothing left to stage, chances are that something else
-already introduced the same changes; you might want to skip this patch."
-			stop_here_user_resolve $this
-		}
-		unmerged=$(git ls-files -u)
-		if test -n "$unmerged"
-		then
-			gettextln "You still have unmerged paths in your index
-did you forget to use 'git add'?"
-			stop_here_user_resolve $this
-		fi
-		apply_status=0
-		git rerere
-		;;
-	esac
-
-	if test $apply_status != 0 && test "$threeway" = t
-	then
-		if (fall_back_3way)
-		then
-		    # Applying the patch to an earlier tree and merging the
-		    # result may have produced the same tree as ours.
-		    git diff-index --quiet --cached HEAD -- && {
-			say "$(gettext "No changes -- Patch already applied.")"
-			go_next
-			continue
-		    }
-		    # clear apply_status -- we have successfully merged.
-		    apply_status=0
-		fi
-	fi
-	if test $apply_status != 0
-	then
-		eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
-		if test "$(git config --bool advice.amworkdir)" != false
-		then
-			eval_gettextln 'The copy of the patch that failed is found in:
-   $dotest/patch'
-		fi
-		stop_here_user_resolve $this
-	fi
-
-	hook="$(git rev-parse --git-path hooks/pre-applypatch)"
-	if test -x "$hook"
-	then
-		"$hook" || stop_here $this
-	fi
-
-	tree=$(git write-tree) &&
-	commit=$(
-		if test -n "$ignore_date"
-		then
-			GIT_AUTHOR_DATE=
-		fi
-		parent=$(git rev-parse --verify -q HEAD) ||
-		say >&2 "$(gettext "applying to an empty history")"
-
-		if test -n "$committer_date_is_author_date"
-		then
-			GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-			export GIT_COMMITTER_DATE
-		fi &&
-		git commit-tree ${parent:+-p} $parent ${gpg_sign_opt:+"$gpg_sign_opt"} $tree  \
-			<"$dotest/final-commit"
-	) &&
-	git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
-	stop_here $this
-
-	if test -f "$dotest/original-commit"; then
-		echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten"
-	fi
-
-	hook="$(git rev-parse --git-path hooks/post-applypatch)"
-	test -x "$hook" && "$hook"
-
-	go_next
-done
-
-if test -s "$dotest"/rewritten; then
-    git notes copy --for-rewrite=rebase < "$dotest"/rewritten
-    hook="$(git rev-parse --git-path hooks/post-rewrite)"
-    if test -x "$hook"; then
-	"$hook" rebase < "$dotest"/rewritten
-    fi
-fi
-
-# If am was called with --rebasing (from git-rebase--am), it's up to
-# the caller to take care of housekeeping.
-if ! test -f "$dotest/rebasing"
-then
-	rm -fr "$dotest"
-	git gc --auto
-fi
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
deleted file mode 100755
index 683cae7..0000000
--- a/contrib/examples/git-checkout.sh
+++ /dev/null
@@ -1,302 +0,0 @@
-#!/bin/sh
-
-OPTIONS_KEEPDASHDASH=t
-OPTIONS_SPEC="\
-git-checkout [options] [<branch>] [<paths>...]
---
-b=          create a new branch started at <branch>
-l           create the new branch's reflog
-track       arrange that the new branch tracks the remote branch
-f           proceed even if the index or working tree is not HEAD
-m           merge local modifications into the new branch
-q,quiet     be quiet
-"
-SUBDIRECTORY_OK=Sometimes
-. git-sh-setup
-require_work_tree
-
-old_name=HEAD
-old=$(git rev-parse --verify $old_name 2>/dev/null)
-oldbranch=$(git symbolic-ref $old_name 2>/dev/null)
-new=
-new_name=
-force=
-branch=
-track=
-newbranch=
-newbranch_log=
-merge=
-quiet=
-v=-v
-LF='
-'
-
-while test $# != 0; do
-	case "$1" in
-	-b)
-		shift
-		newbranch="$1"
-		[ -z "$newbranch" ] &&
-			die "git checkout: -b needs a branch name"
-		git show-ref --verify --quiet -- "refs/heads/$newbranch" &&
-			die "git checkout: branch $newbranch already exists"
-		git check-ref-format "heads/$newbranch" ||
-			die "git checkout: we do not like '$newbranch' as a branch name."
-		;;
-	-l)
-		newbranch_log=-l
-		;;
-	--track|--no-track)
-		track="$1"
-		;;
-	-f)
-		force=1
-		;;
-	-m)
-		merge=1
-		;;
-	-q|--quiet)
-		quiet=1
-		v=
-		;;
-	--)
-		shift
-		break
-		;;
-	*)
-		usage
-		;;
-	esac
-	shift
-done
-
-arg="$1"
-rev=$(git rev-parse --verify "$arg" 2>/dev/null)
-if rev=$(git rev-parse --verify "$rev^0" 2>/dev/null)
-then
-	[ -z "$rev" ] && die "unknown flag $arg"
-	new_name="$arg"
-	if git show-ref --verify --quiet -- "refs/heads/$arg"
-	then
-		rev=$(git rev-parse --verify "refs/heads/$arg^0")
-		branch="$arg"
-	fi
-	new="$rev"
-	shift
-elif rev=$(git rev-parse --verify "$rev^{tree}" 2>/dev/null)
-then
-	# checking out selected paths from a tree-ish.
-	new="$rev"
-	new_name="$rev^{tree}"
-	shift
-fi
-[ "$1" = "--" ] && shift
-
-case "$newbranch,$track" in
-,--*)
-	die "git checkout: --track and --no-track require -b"
-esac
-
-case "$force$merge" in
-11)
-	die "git checkout: -f and -m are incompatible"
-esac
-
-# The behaviour of the command with and without explicit path
-# parameters is quite different.
-#
-# Without paths, we are checking out everything in the work tree,
-# possibly switching branches.  This is the traditional behaviour.
-#
-# With paths, we are _never_ switching branch, but checking out
-# the named paths from either index (when no rev is given),
-# or the named tree-ish (when rev is given).
-
-if test "$#" -ge 1
-then
-	hint=
-	if test "$#" -eq 1
-	then
-		hint="
-Did you intend to checkout '$@' which can not be resolved as commit?"
-	fi
-	if test '' != "$newbranch$force$merge"
-	then
-		die "git checkout: updating paths is incompatible with switching branches/forcing$hint"
-	fi
-	if test '' != "$new"
-	then
-		# from a specific tree-ish; note that this is for
-		# rescuing paths and is never meant to remove what
-		# is not in the named tree-ish.
-		git ls-tree --full-name -r "$new" "$@" |
-		git update-index --index-info || exit $?
-	fi
-
-	# Make sure the request is about existing paths.
-	git ls-files --full-name --error-unmatch -- "$@" >/dev/null || exit
-	git ls-files --full-name -- "$@" |
-		(cd_to_toplevel && git checkout-index -f -u --stdin)
-
-	# Run a post-checkout hook -- the HEAD does not change so the
-	# current HEAD is passed in for both args
-	if test -x "$GIT_DIR"/hooks/post-checkout; then
-	    "$GIT_DIR"/hooks/post-checkout $old $old 0
-	fi
-
-	exit $?
-else
-	# Make sure we did not fall back on $arg^{tree} codepath
-	# since we are not checking out from an arbitrary tree-ish,
-	# but switching branches.
-	if test '' != "$new"
-	then
-		git rev-parse --verify "$new^{commit}" >/dev/null 2>&1 ||
-		die "Cannot switch branch to a non-commit."
-	fi
-fi
-
-# We are switching branches and checking out trees, so
-# we *NEED* to be at the toplevel.
-cd_to_toplevel
-
-[ -z "$new" ] && new=$old && new_name="$old_name"
-
-# If we don't have an existing branch that we're switching to,
-# and we don't have a new branch name for the target we
-# are switching to, then we are detaching our HEAD from any
-# branch.  However, if "git checkout HEAD" detaches the HEAD
-# from the current branch, even though that may be logically
-# correct, it feels somewhat funny.  More importantly, we do not
-# want "git checkout" or "git checkout -f" to detach HEAD.
-
-detached=
-detach_warn=
-
-describe_detached_head () {
-	test -n "$quiet" || {
-		printf >&2 "$1 "
-		GIT_PAGER= git log >&2 -1 --pretty=oneline --abbrev-commit "$2" --
-	}
-}
-
-if test -z "$branch$newbranch" && test "$new_name" != "$old_name"
-then
-	detached="$new"
-	if test -n "$oldbranch" && test -z "$quiet"
-	then
-		detach_warn="Note: moving to \"$new_name\" which isn't a local branch
-If you want to create a new branch from this checkout, you may do so
-(now or later) by using -b with the checkout command again. Example:
-  git checkout -b <new_branch_name>"
-	fi
-elif test -z "$oldbranch" && test "$new" != "$old"
-then
-	describe_detached_head 'Previous HEAD position was' "$old"
-fi
-
-if [ "X$old" = X ]
-then
-	if test -z "$quiet"
-	then
-		echo >&2 "warning: You appear to be on a branch yet to be born."
-		echo >&2 "warning: Forcing checkout of $new_name."
-	fi
-	force=1
-fi
-
-if [ "$force" ]
-then
-    git read-tree $v --reset -u $new
-else
-    git update-index --refresh >/dev/null
-    git read-tree $v -m -u --exclude-per-directory=.gitignore $old $new || (
-	case "$merge,$v" in
-	,*)
-		exit 1 ;;
-	1,)
-		;; # quiet
-	*)
-		echo >&2 "Falling back to 3-way merge..." ;;
-	esac
-
-	# Match the index to the working tree, and do a three-way.
-	git diff-files --name-only | git update-index --remove --stdin &&
-	work=$(git write-tree) &&
-	git read-tree $v --reset -u $new || exit
-
-	eval GITHEAD_$new='${new_name:-${branch:-$new}}' &&
-	eval GITHEAD_$work=local &&
-	export GITHEAD_$new GITHEAD_$work &&
-	git merge-recursive $old -- $new $work
-
-	# Do not register the cleanly merged paths in the index yet.
-	# this is not a real merge before committing, but just carrying
-	# the working tree changes along.
-	unmerged=$(git ls-files -u)
-	git read-tree $v --reset $new
-	case "$unmerged" in
-	'')	;;
-	*)
-		(
-			z40=0000000000000000000000000000000000000000
-			echo "$unmerged" |
-			sed -e 's/^[0-7]* [0-9a-f]* /'"0 $z40 /"
-			echo "$unmerged"
-		) | git update-index --index-info
-		;;
-	esac
-	exit 0
-    )
-    saved_err=$?
-    if test "$saved_err" = 0 && test -z "$quiet"
-    then
-	git diff-index --name-status "$new"
-    fi
-    (exit $saved_err)
-fi
-
-#
-# Switch the HEAD pointer to the new branch if we
-# checked out a branch head, and remove any potential
-# old MERGE_HEAD's (subsequent commits will clearly not
-# be based on them, since we re-set the index)
-#
-if [ "$?" -eq 0 ]; then
-	if [ "$newbranch" ]; then
-		git branch $track $newbranch_log "$newbranch" "$new_name" || exit
-		branch="$newbranch"
-	fi
-	if test -n "$branch"
-	then
-		old_branch_name=$(expr "z$oldbranch" : 'zrefs/heads/\(.*\)')
-		GIT_DIR="$GIT_DIR" git symbolic-ref -m "checkout: moving from ${old_branch_name:-$old} to $branch" HEAD "refs/heads/$branch"
-		if test -n "$quiet"
-		then
-			true	# nothing
-		elif test "refs/heads/$branch" = "$oldbranch"
-		then
-			echo >&2 "Already on branch \"$branch\""
-		else
-			echo >&2 "Switched to${newbranch:+ a new} branch \"$branch\""
-		fi
-	elif test -n "$detached"
-	then
-		old_branch_name=$(expr "z$oldbranch" : 'zrefs/heads/\(.*\)')
-		git update-ref --no-deref -m "checkout: moving from ${old_branch_name:-$old} to $arg" HEAD "$detached" ||
-			die "Cannot detach HEAD"
-		if test -n "$detach_warn"
-		then
-			echo >&2 "$detach_warn"
-		fi
-		describe_detached_head 'HEAD is now at' HEAD
-	fi
-	rm -f "$GIT_DIR/MERGE_HEAD"
-else
-	exit 1
-fi
-
-# Run a post-checkout hook
-if test -x "$GIT_DIR"/hooks/post-checkout; then
-	"$GIT_DIR"/hooks/post-checkout $old $new 1
-fi
diff --git a/contrib/examples/git-clean.sh b/contrib/examples/git-clean.sh
deleted file mode 100755
index 01c95e9..0000000
--- a/contrib/examples/git-clean.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005-2006 Pavel Roskin
-#
-
-OPTIONS_KEEPDASHDASH=
-OPTIONS_SPEC="\
-git-clean [options] <paths>...
-
-Clean untracked files from the working directory
-
-When optional <paths>... arguments are given, the paths
-affected are further limited to those that match them.
---
-d remove directories as well
-f override clean.requireForce and clean anyway
-n don't remove anything, just show what would be done
-q be quiet, only report errors
-x remove ignored files as well
-X remove only ignored files"
-
-SUBDIRECTORY_OK=Yes
-. git-sh-setup
-require_work_tree
-
-ignored=
-ignoredonly=
-cleandir=
-rmf="rm -f --"
-rmrf="rm -rf --"
-rm_refuse="echo Not removing"
-echo1="echo"
-
-disabled=$(git config --bool clean.requireForce)
-
-while test $# != 0
-do
-	case "$1" in
-	-d)
-		cleandir=1
-		;;
-	-f)
-		disabled=false
-		;;
-	-n)
-		disabled=false
-		rmf="echo Would remove"
-		rmrf="echo Would remove"
-		rm_refuse="echo Would not remove"
-		echo1=":"
-		;;
-	-q)
-		echo1=":"
-		;;
-	-x)
-		ignored=1
-		;;
-	-X)
-		ignoredonly=1
-		;;
-	--)
-		shift
-		break
-		;;
-	*)
-		usage # should not happen
-		;;
-	esac
-	shift
-done
-
-# requireForce used to default to false but now it defaults to true.
-# IOW, lack of explicit "clean.requireForce = false" is taken as
-# "clean.requireForce = true".
-case "$disabled" in
-"")
-	die "clean.requireForce not set and -n or -f not given; refusing to clean"
-	;;
-"true")
-	die "clean.requireForce set and -n or -f not given; refusing to clean"
-	;;
-esac
-
-if [ "$ignored,$ignoredonly" = "1,1" ]; then
-	die "-x and -X cannot be set together"
-fi
-
-if [ -z "$ignored" ]; then
-	excl="--exclude-per-directory=.gitignore"
-	excl_info= excludes_file=
-	if [ -f "$GIT_DIR/info/exclude" ]; then
-		excl_info="--exclude-from=$GIT_DIR/info/exclude"
-	fi
-	if cfg_excl=$(git config core.excludesfile) && test -f "$cfg_excl"
-	then
-		excludes_file="--exclude-from=$cfg_excl"
-	fi
-	if [ "$ignoredonly" ]; then
-		excl="$excl --ignored"
-	fi
-fi
-
-git ls-files --others --directory \
-	$excl ${excl_info:+"$excl_info"} ${excludes_file:+"$excludes_file"} \
-	-- "$@" |
-while read -r file; do
-	if [ -d "$file" -a ! -L "$file" ]; then
-		if [ -z "$cleandir" ]; then
-			$rm_refuse "$file"
-			continue
-		fi
-		$echo1 "Removing $file"
-		$rmrf "$file"
-	else
-		$echo1 "Removing $file"
-		$rmf "$file"
-	fi
-done
diff --git a/contrib/examples/git-clone.sh b/contrib/examples/git-clone.sh
deleted file mode 100755
index 08cf246..0000000
--- a/contrib/examples/git-clone.sh
+++ /dev/null
@@ -1,525 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005, Linus Torvalds
-# Copyright (c) 2005, Junio C Hamano
-#
-# Clone a repository into a different directory that does not yet exist.
-
-# See git-sh-setup why.
-unset CDPATH
-
-OPTIONS_SPEC="\
-git-clone [options] [--] <repo> [<dir>]
---
-n,no-checkout        don't create a checkout
-bare                 create a bare repository
-naked                create a bare repository
-l,local              to clone from a local repository
-no-hardlinks         don't use local hardlinks, always copy
-s,shared             setup as a shared repository
-template=            path to the template directory
-q,quiet              be quiet
-reference=           reference repository
-o,origin=            use <name> instead of 'origin' to track upstream
-u,upload-pack=       path to git-upload-pack on the remote
-depth=               create a shallow clone of that depth
-
-use-separate-remote  compatibility, do not use
-no-separate-remote   compatibility, do not use"
-
-die() {
-	echo >&2 "$@"
-	exit 1
-}
-
-usage() {
-	exec "$0" -h
-}
-
-eval "$(echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
-
-get_repo_base() {
-	(
-		cd "$(/bin/pwd)" &&
-		cd "$1" || cd "$1.git" &&
-		{
-			cd .git
-			pwd
-		}
-	) 2>/dev/null
-}
-
-if [ -n "$GIT_SSL_NO_VERIFY" -o \
-	"$(git config --bool http.sslVerify)" = false ]; then
-    curl_extra_args="-k"
-fi
-
-http_fetch () {
-	# $1 = Remote, $2 = Local
-	curl -nsfL $curl_extra_args "$1" >"$2"
-	curl_exit_status=$?
-	case $curl_exit_status in
-	126|127) exit ;;
-	*)	 return $curl_exit_status ;;
-	esac
-}
-
-clone_dumb_http () {
-	# $1 - remote, $2 - local
-	cd "$2" &&
-	clone_tmp="$GIT_DIR/clone-tmp" &&
-	mkdir -p "$clone_tmp" || exit 1
-	if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
-		"$(git config --bool http.noEPSV)" = true ]; then
-		curl_extra_args="${curl_extra_args} --disable-epsv"
-	fi
-	http_fetch "$1/info/refs" "$clone_tmp/refs" ||
-		die "Cannot get remote repository information.
-Perhaps git-update-server-info needs to be run there?"
-	test "z$quiet" = z && v=-v || v=
-	while read sha1 refname
-	do
-		name=$(expr "z$refname" : 'zrefs/\(.*\)') &&
-		case "$name" in
-		*^*)	continue;;
-		esac
-		case "$bare,$name" in
-		yes,* | ,heads/* | ,tags/*) ;;
-		*)	continue ;;
-		esac
-		if test -n "$use_separate_remote" &&
-		   branch_name=$(expr "z$name" : 'zheads/\(.*\)')
-		then
-			tname="remotes/$origin/$branch_name"
-		else
-			tname=$name
-		fi
-		git-http-fetch $v -a -w "$tname" "$sha1" "$1" || exit 1
-	done <"$clone_tmp/refs"
-	rm -fr "$clone_tmp"
-	http_fetch "$1/HEAD" "$GIT_DIR/REMOTE_HEAD" ||
-	rm -f "$GIT_DIR/REMOTE_HEAD"
-	if test -f "$GIT_DIR/REMOTE_HEAD"; then
-		head_sha1=$(cat "$GIT_DIR/REMOTE_HEAD")
-		case "$head_sha1" in
-		'ref: refs/'*)
-			;;
-		*)
-			git-http-fetch $v -a "$head_sha1" "$1" ||
-			rm -f "$GIT_DIR/REMOTE_HEAD"
-			;;
-		esac
-	fi
-}
-
-quiet=
-local=no
-use_local_hardlink=yes
-local_shared=no
-unset template
-no_checkout=
-upload_pack=
-bare=
-reference=
-origin=
-origin_override=
-use_separate_remote=t
-depth=
-no_progress=
-local_explicitly_asked_for=
-test -t 1 || no_progress=--no-progress
-
-while test $# != 0
-do
-	case "$1" in
-	-n|--no-checkout)
-		no_checkout=yes ;;
-	--naked|--bare)
-		bare=yes ;;
-	-l|--local)
-		local_explicitly_asked_for=yes
-		use_local_hardlink=yes
-		;;
-	--no-hardlinks)
-		use_local_hardlink=no ;;
-	-s|--shared)
-		local_shared=yes ;;
-	--template)
-		shift; template="--template=$1" ;;
-	-q|--quiet)
-		quiet=-q ;;
-	--use-separate-remote|--no-separate-remote)
-		die "clones are always made with separate-remote layout" ;;
-	--reference)
-		shift; reference="$1" ;;
-	-o|--origin)
-		shift;
-		case "$1" in
-		'')
-		    usage ;;
-		*/*)
-		    die "'$1' is not suitable for an origin name"
-		esac
-		git check-ref-format "heads/$1" ||
-		    die "'$1' is not suitable for a branch name"
-		test -z "$origin_override" ||
-		    die "Do not give more than one --origin options."
-		origin_override=yes
-		origin="$1"
-		;;
-	-u|--upload-pack)
-		shift
-		upload_pack="--upload-pack=$1" ;;
-	--depth)
-		shift
-		depth="--depth=$1" ;;
-	--)
-		shift
-		break ;;
-	*)
-		usage ;;
-	esac
-	shift
-done
-
-repo="$1"
-test -n "$repo" ||
-    die 'you must specify a repository to clone.'
-
-# --bare implies --no-checkout and --no-separate-remote
-if test yes = "$bare"
-then
-	if test yes = "$origin_override"
-	then
-		die '--bare and --origin $origin options are incompatible.'
-	fi
-	no_checkout=yes
-	use_separate_remote=
-fi
-
-if test -z "$origin"
-then
-	origin=origin
-fi
-
-# Turn the source into an absolute path if
-# it is local
-if base=$(get_repo_base "$repo"); then
-	repo="$base"
-	if test -z "$depth"
-	then
-		local=yes
-	fi
-elif test -f "$repo"
-then
-	case "$repo" in /*) ;; *) repo="$PWD/$repo" ;; esac
-fi
-
-# Decide the directory name of the new repository
-if test -n "$2"
-then
-	dir="$2"
-	test $# = 2 || die "excess parameter to git-clone"
-else
-	# Derive one from the repository name
-	# Try using "humanish" part of source repo if user didn't specify one
-	if test -f "$repo"
-	then
-		# Cloning from a bundle
-		dir=$(echo "$repo" | sed -e 's|/*\.bundle$||' -e 's|.*/||g')
-	else
-		dir=$(echo "$repo" |
-			sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
-	fi
-fi
-
-[ -e "$dir" ] && die "destination directory '$dir' already exists."
-[ yes = "$bare" ] && unset GIT_WORK_TREE
-[ -n "$GIT_WORK_TREE" ] && [ -e "$GIT_WORK_TREE" ] &&
-die "working tree '$GIT_WORK_TREE' already exists."
-D=
-W=
-cleanup() {
-	test -z "$D" && rm -rf "$dir"
-	test -z "$W" && test -n "$GIT_WORK_TREE" && rm -rf "$GIT_WORK_TREE"
-	cd ..
-	test -n "$D" && rm -rf "$D"
-	test -n "$W" && rm -rf "$W"
-	exit $err
-}
-trap 'err=$?; cleanup' 0
-mkdir -p "$dir" && D=$(cd "$dir" && pwd) || usage
-test -n "$GIT_WORK_TREE" && mkdir -p "$GIT_WORK_TREE" &&
-W=$(cd "$GIT_WORK_TREE" && pwd) && GIT_WORK_TREE="$W" && export GIT_WORK_TREE
-if test yes = "$bare" || test -n "$GIT_WORK_TREE"; then
-	GIT_DIR="$D"
-else
-	GIT_DIR="$D/.git"
-fi &&
-export GIT_DIR &&
-GIT_CONFIG="$GIT_DIR/config" git-init $quiet ${template+"$template"} || usage
-
-if test -n "$bare"
-then
-	GIT_CONFIG="$GIT_DIR/config" git config core.bare true
-fi
-
-if test -n "$reference"
-then
-	ref_git=
-	if test -d "$reference"
-	then
-		if test -d "$reference/.git/objects"
-		then
-			ref_git="$reference/.git"
-		elif test -d "$reference/objects"
-		then
-			ref_git="$reference"
-		fi
-	fi
-	if test -n "$ref_git"
-	then
-		ref_git=$(cd "$ref_git" && pwd)
-		echo "$ref_git/objects" >"$GIT_DIR/objects/info/alternates"
-		(
-			GIT_DIR="$ref_git" git for-each-ref \
-				--format='%(objectname) %(*objectname)'
-		) |
-		while read a b
-		do
-			test -z "$a" ||
-			git update-ref "refs/reference-tmp/$a" "$a"
-			test -z "$b" ||
-			git update-ref "refs/reference-tmp/$b" "$b"
-		done
-	else
-		die "reference repository '$reference' is not a local directory."
-	fi
-fi
-
-rm -f "$GIT_DIR/CLONE_HEAD"
-
-# We do local magic only when the user tells us to.
-case "$local" in
-yes)
-	( cd "$repo/objects" ) ||
-		die "cannot chdir to local '$repo/objects'."
-
-	if test "$local_shared" = yes
-	then
-		mkdir -p "$GIT_DIR/objects/info"
-		echo "$repo/objects" >>"$GIT_DIR/objects/info/alternates"
-	else
-		cpio_quiet_flag=""
-		cpio --help 2>&1 | grep -- --quiet >/dev/null && \
-			cpio_quiet_flag=--quiet
-		l= &&
-		if test "$use_local_hardlink" = yes
-		then
-			# See if we can hardlink and drop "l" if not.
-			sample_file=$(cd "$repo" && \
-				      find objects -type f -print | sed -e 1q)
-			# objects directory should not be empty because
-			# we are cloning!
-			test -f "$repo/$sample_file" ||
-				die "fatal: cannot clone empty repository"
-			if ln "$repo/$sample_file" "$GIT_DIR/objects/sample" 2>/dev/null
-			then
-				rm -f "$GIT_DIR/objects/sample"
-				l=l
-			elif test -n "$local_explicitly_asked_for"
-			then
-				echo >&2 "Warning: -l asked but cannot hardlink to $repo"
-			fi
-		fi &&
-		cd "$repo" &&
-		# Create dirs using umask and permissions and destination
-		find objects -type d -print | (cd "$GIT_DIR" && xargs mkdir -p) &&
-		# Copy existing 0444 permissions on content
-		find objects ! -type d -print | cpio $cpio_quiet_flag -pumd$l "$GIT_DIR/" || \
-			exit 1
-	fi
-	git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD" || exit 1
-	;;
-*)
-	case "$repo" in
-	rsync://*)
-		case "$depth" in
-		"") ;;
-		*) die "shallow over rsync not supported" ;;
-		esac
-		rsync $quiet -av --ignore-existing  \
-			--exclude info "$repo/objects/" "$GIT_DIR/objects/" ||
-		exit
-		# Look at objects/info/alternates for rsync -- http will
-		# support it natively and git native ones will do it on the
-		# remote end.  Not having that file is not a crime.
-		rsync -q "$repo/objects/info/alternates" \
-			"$GIT_DIR/TMP_ALT" 2>/dev/null ||
-			rm -f "$GIT_DIR/TMP_ALT"
-		if test -f "$GIT_DIR/TMP_ALT"
-		then
-		    ( cd "$D" &&
-		      . git-parse-remote &&
-		      resolve_alternates "$repo" <"$GIT_DIR/TMP_ALT" ) |
-		    while read alt
-		    do
-			case "$alt" in 'bad alternate: '*) die "$alt";; esac
-			case "$quiet" in
-			'')	echo >&2 "Getting alternate: $alt" ;;
-			esac
-			rsync $quiet -av --ignore-existing  \
-			    --exclude info "$alt" "$GIT_DIR/objects" || exit
-		    done
-		    rm -f "$GIT_DIR/TMP_ALT"
-		fi
-		git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD" || exit 1
-		;;
-	https://*|http://*|ftp://*)
-		case "$depth" in
-		"") ;;
-		*) die "shallow over http or ftp not supported" ;;
-		esac
-		if test -z "@@NO_CURL@@"
-		then
-			clone_dumb_http "$repo" "$D"
-		else
-			die "http transport not supported, rebuild Git with curl support"
-		fi
-		;;
-	*)
-		if [ -f "$repo" ] ; then
-			git bundle unbundle "$repo" > "$GIT_DIR/CLONE_HEAD" ||
-			die "unbundle from '$repo' failed."
-		else
-			case "$upload_pack" in
-			'') git-fetch-pack --all -k $quiet $depth $no_progress "$repo";;
-			*) git-fetch-pack --all -k \
-				$quiet "$upload_pack" $depth $no_progress "$repo" ;;
-			esac >"$GIT_DIR/CLONE_HEAD" ||
-			die "fetch-pack from '$repo' failed."
-		fi
-		;;
-	esac
-	;;
-esac
-test -d "$GIT_DIR/refs/reference-tmp" && rm -fr "$GIT_DIR/refs/reference-tmp"
-
-if test -f "$GIT_DIR/CLONE_HEAD"
-then
-	# Read git-fetch-pack -k output and store the remote branches.
-	if [ -n "$use_separate_remote" ]
-	then
-		branch_top="remotes/$origin"
-	else
-		branch_top="heads"
-	fi
-	tag_top="tags"
-	while read sha1 name
-	do
-		case "$name" in
-		*'^{}')
-			continue ;;
-		HEAD)
-			destname="REMOTE_HEAD" ;;
-		refs/heads/*)
-			destname="refs/$branch_top/${name#refs/heads/}" ;;
-		refs/tags/*)
-			destname="refs/$tag_top/${name#refs/tags/}" ;;
-		*)
-			continue ;;
-		esac
-		git update-ref -m "clone: from $repo" "$destname" "$sha1" ""
-	done < "$GIT_DIR/CLONE_HEAD"
-fi
-
-if test -n "$W"; then
-	cd "$W" || exit
-else
-	cd "$D" || exit
-fi
-
-if test -z "$bare"
-then
-	# a non-bare repository is always in separate-remote layout
-	remote_top="refs/remotes/$origin"
-	head_sha1=
-	test ! -r "$GIT_DIR/REMOTE_HEAD" || head_sha1=$(cat "$GIT_DIR/REMOTE_HEAD")
-	case "$head_sha1" in
-	'ref: refs/'*)
-		# Uh-oh, the remote told us (http transport done against
-		# new style repository with a symref HEAD).
-		# Ideally we should skip the guesswork but for now
-		# opt for minimum change.
-		head_sha1=$(expr "z$head_sha1" : 'zref: refs/heads/\(.*\)')
-		head_sha1=$(cat "$GIT_DIR/$remote_top/$head_sha1")
-		;;
-	esac
-
-	# The name under $remote_top the remote HEAD seems to point at.
-	head_points_at=$(
-		(
-			test -f "$GIT_DIR/$remote_top/master" && echo "master"
-			cd "$GIT_DIR/$remote_top" &&
-			find . -type f -print | sed -e 's/^\.\///'
-		) | (
-		done=f
-		while read name
-		do
-			test t = $done && continue
-			branch_tip=$(cat "$GIT_DIR/$remote_top/$name")
-			if test "$head_sha1" = "$branch_tip"
-			then
-				echo "$name"
-				done=t
-			fi
-		done
-		)
-	)
-
-	# Upstream URL
-	git config remote."$origin".url "$repo" &&
-
-	# Set up the mappings to track the remote branches.
-	git config remote."$origin".fetch \
-		"+refs/heads/*:$remote_top/*" '^$' &&
-
-	# Write out remote.$origin config, and update our "$head_points_at".
-	case "$head_points_at" in
-	?*)
-		# Local default branch
-		git symbolic-ref HEAD "refs/heads/$head_points_at" &&
-
-		# Tracking branch for the primary branch at the remote.
-		git update-ref HEAD "$head_sha1" &&
-
-		rm -f "refs/remotes/$origin/HEAD"
-		git symbolic-ref "refs/remotes/$origin/HEAD" \
-			"refs/remotes/$origin/$head_points_at" &&
-
-		git config branch."$head_points_at".remote "$origin" &&
-		git config branch."$head_points_at".merge "refs/heads/$head_points_at"
-		;;
-	'')
-		if test -z "$head_sha1"
-		then
-			# Source had nonexistent ref in HEAD
-			echo >&2 "Warning: Remote HEAD refers to nonexistent ref, unable to checkout."
-			no_checkout=t
-		else
-			# Source had detached HEAD pointing nowhere
-			git update-ref --no-deref HEAD "$head_sha1" &&
-			rm -f "refs/remotes/$origin/HEAD"
-		fi
-		;;
-	esac
-
-	case "$no_checkout" in
-	'')
-		test "z$quiet" = z && test "z$no_progress" = z && v=-v || v=
-		git read-tree -m -u $v HEAD HEAD
-	esac
-fi
-rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"
-
-trap - 0
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
deleted file mode 100755
index 86c9cfa..0000000
--- a/contrib/examples/git-commit.sh
+++ /dev/null
@@ -1,639 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-# Copyright (c) 2006 Junio C Hamano
-
-USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [--template <file>] [[-i | -o] <path>...]'
-SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
-. git-sh-setup
-require_work_tree
-
-git rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
-
-case "$0" in
-*status)
-	status_only=t
-	;;
-*commit)
-	status_only=
-	;;
-esac
-
-refuse_partial () {
-	echo >&2 "$1"
-	echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
-	exit 1
-}
-
-TMP_INDEX=
-THIS_INDEX="${GIT_INDEX_FILE:-$GIT_DIR/index}"
-NEXT_INDEX="$GIT_DIR/next-index$$"
-rm -f "$NEXT_INDEX"
-save_index () {
-	cp -p "$THIS_INDEX" "$NEXT_INDEX"
-}
-
-run_status () {
-	# If TMP_INDEX is defined, that means we are doing
-	# "--only" partial commit, and that index file is used
-	# to build the tree for the commit.  Otherwise, if
-	# NEXT_INDEX exists, that is the index file used to
-	# make the commit.  Otherwise we are using as-is commit
-	# so the regular index file is what we use to compare.
-	if test '' != "$TMP_INDEX"
-	then
-		GIT_INDEX_FILE="$TMP_INDEX"
-		export GIT_INDEX_FILE
-	elif test -f "$NEXT_INDEX"
-	then
-		GIT_INDEX_FILE="$NEXT_INDEX"
-		export GIT_INDEX_FILE
-	fi
-
-	if test "$status_only" = "t" || test "$use_status_color" = "t"; then
-		color=
-	else
-		color=--nocolor
-	fi
-	git runstatus ${color} \
-		${verbose:+--verbose} \
-		${amend:+--amend} \
-		${untracked_files:+--untracked}
-}
-
-trap '
-	test -z "$TMP_INDEX" || {
-		test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
-	}
-	rm -f "$NEXT_INDEX"
-' 0
-
-################################################################
-# Command line argument parsing and sanity checking
-
-all=
-also=
-allow_empty=f
-interactive=
-only=
-logfile=
-use_commit=
-amend=
-edit_flag=
-no_edit=
-log_given=
-log_message=
-verify=t
-quiet=
-verbose=
-signoff=
-force_author=
-only_include_assumed=
-untracked_files=
-templatefile="$(git config commit.template)"
-while test $# != 0
-do
-	case "$1" in
-	-F|--F|-f|--f|--fi|--fil|--file)
-		case "$#" in 1) usage ;; esac
-		shift
-		no_edit=t
-		log_given=t$log_given
-		logfile="$1"
-		;;
-	-F*|-f*)
-		no_edit=t
-		log_given=t$log_given
-		logfile="${1#-[Ff]}"
-		;;
-	--F=*|--f=*|--fi=*|--fil=*|--file=*)
-		no_edit=t
-		log_given=t$log_given
-		logfile="${1#*=}"
-		;;
-	-a|--a|--al|--all)
-		all=t
-		;;
-	--allo|--allow|--allow-|--allow-e|--allow-em|--allow-emp|\
-	--allow-empt|--allow-empty)
-		allow_empty=t
-		;;
-	--au=*|--aut=*|--auth=*|--autho=*|--author=*)
-		force_author="${1#*=}"
-		;;
-	--au|--aut|--auth|--autho|--author)
-		case "$#" in 1) usage ;; esac
-		shift
-		force_author="$1"
-		;;
-	-e|--e|--ed|--edi|--edit)
-		edit_flag=t
-		;;
-	-i|--i|--in|--inc|--incl|--inclu|--includ|--include)
-		also=t
-		;;
-	--int|--inte|--inter|--intera|--interac|--interact|--interacti|\
-	--interactiv|--interactive)
-		interactive=t
-		;;
-	-o|--o|--on|--onl|--only)
-		only=t
-		;;
-	-m|--m|--me|--mes|--mess|--messa|--messag|--message)
-		case "$#" in 1) usage ;; esac
-		shift
-		log_given=m$log_given
-		log_message="${log_message:+${log_message}
-
-}$1"
-		no_edit=t
-		;;
-	-m*)
-		log_given=m$log_given
-		log_message="${log_message:+${log_message}
-
-}${1#-m}"
-		no_edit=t
-		;;
-	--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
-		log_given=m$log_given
-		log_message="${log_message:+${log_message}
-
-}${1#*=}"
-		no_edit=t
-		;;
-	-n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
-	--no-verify)
-		verify=
-		;;
-	--a|--am|--ame|--amen|--amend)
-		amend=t
-		use_commit=HEAD
-		;;
-	-c)
-		case "$#" in 1) usage ;; esac
-		shift
-		log_given=t$log_given
-		use_commit="$1"
-		no_edit=
-		;;
-	--ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
-	--reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
-	--reedit-messag=*|--reedit-message=*)
-		log_given=t$log_given
-		use_commit="${1#*=}"
-		no_edit=
-		;;
-	--ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
-	--reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
-	--reedit-message)
-		case "$#" in 1) usage ;; esac
-		shift
-		log_given=t$log_given
-		use_commit="$1"
-		no_edit=
-		;;
-	-C)
-		case "$#" in 1) usage ;; esac
-		shift
-		log_given=t$log_given
-		use_commit="$1"
-		no_edit=t
-		;;
-	--reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
-	--reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
-	--reuse-message=*)
-		log_given=t$log_given
-		use_commit="${1#*=}"
-		no_edit=t
-		;;
-	--reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
-	--reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
-		case "$#" in 1) usage ;; esac
-		shift
-		log_given=t$log_given
-		use_commit="$1"
-		no_edit=t
-		;;
-	-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
-		signoff=t
-		;;
-	-t|--t|--te|--tem|--temp|--templ|--templa|--templat|--template)
-		case "$#" in 1) usage ;; esac
-		shift
-		templatefile="$1"
-		no_edit=
-		;;
-	-q|--q|--qu|--qui|--quie|--quiet)
-		quiet=t
-		;;
-	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
-		verbose=t
-		;;
-	-u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
-	--untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
-	--untracked-file|--untracked-files)
-		untracked_files=t
-		;;
-	--)
-		shift
-		break
-		;;
-	-*)
-		usage
-		;;
-	*)
-		break
-		;;
-	esac
-	shift
-done
-case "$edit_flag" in t) no_edit= ;; esac
-
-################################################################
-# Sanity check options
-
-case "$amend,$initial_commit" in
-t,t)
-	die "You do not have anything to amend." ;;
-t,)
-	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
-		die "You are in the middle of a merge -- cannot amend."
-	fi ;;
-esac
-
-case "$log_given" in
-tt*)
-	die "Only one of -c/-C/-F can be used." ;;
-*tm*|*mt*)
-	die "Option -m cannot be combined with -c/-C/-F." ;;
-esac
-
-case "$#,$also,$only,$amend" in
-*,t,t,*)
-	die "Only one of --include/--only can be used." ;;
-0,t,,* | 0,,t,)
-	die "No paths with --include/--only does not make sense." ;;
-0,,t,t)
-	only_include_assumed="# Clever... amending the last one with dirty index." ;;
-0,,,*)
-	;;
-*,,,*)
-	only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
-	also=
-	;;
-esac
-unset only
-case "$all,$interactive,$also,$#" in
-*t,*t,*)
-	die "Cannot use -a, --interactive or -i at the same time." ;;
-t,,,[1-9]*)
-	die "Paths with -a does not make sense." ;;
-,t,,[1-9]*)
-	die "Paths with --interactive does not make sense." ;;
-,,t,0)
-	die "No paths with -i does not make sense." ;;
-esac
-
-if test ! -z "$templatefile" && test -z "$log_given"
-then
-	if test ! -f "$templatefile"
-	then
-		die "Commit template file does not exist."
-	fi
-fi
-
-################################################################
-# Prepare index to have a tree to be committed
-
-case "$all,$also" in
-t,)
-	if test ! -f "$THIS_INDEX"
-	then
-		die 'nothing to commit (use "git add file1 file2" to include for commit)'
-	fi
-	save_index &&
-	(
-		cd_to_toplevel &&
-		GIT_INDEX_FILE="$NEXT_INDEX" &&
-		export GIT_INDEX_FILE &&
-		git diff-files --name-only -z |
-		git update-index --remove -z --stdin
-	) || exit
-	;;
-,t)
-	save_index &&
-	git ls-files --error-unmatch -- "$@" >/dev/null || exit
-
-	git diff-files --name-only -z -- "$@"  |
-	(
-		cd_to_toplevel &&
-		GIT_INDEX_FILE="$NEXT_INDEX" &&
-		export GIT_INDEX_FILE &&
-		git update-index --remove -z --stdin
-	) || exit
-	;;
-,)
-	if test "$interactive" = t; then
-		git add --interactive || exit
-	fi
-	case "$#" in
-	0)
-		;; # commit as-is
-	*)
-		if test -f "$GIT_DIR/MERGE_HEAD"
-		then
-			refuse_partial "Cannot do a partial commit during a merge."
-		fi
-
-		TMP_INDEX="$GIT_DIR/tmp-index$$"
-		W=
-		test -z "$initial_commit" && W=--with-tree=HEAD
-		commit_only=$(git ls-files --error-unmatch $W -- "$@") || exit
-
-		# Build a temporary index and update the real index
-		# the same way.
-		if test -z "$initial_commit"
-		then
-			GIT_INDEX_FILE="$THIS_INDEX" \
-			git read-tree --index-output="$TMP_INDEX" -i -m HEAD
-		else
-			rm -f "$TMP_INDEX"
-		fi || exit
-
-		printf '%s\n' "$commit_only" |
-		GIT_INDEX_FILE="$TMP_INDEX" \
-		git update-index --add --remove --stdin &&
-
-		save_index &&
-		printf '%s\n' "$commit_only" |
-		(
-			GIT_INDEX_FILE="$NEXT_INDEX"
-			export GIT_INDEX_FILE
-			git update-index --add --remove --stdin
-		) || exit
-		;;
-	esac
-	;;
-esac
-
-################################################################
-# If we do as-is commit, the index file will be THIS_INDEX,
-# otherwise NEXT_INDEX after we make this commit.  We leave
-# the index as is if we abort.
-
-if test -f "$NEXT_INDEX"
-then
-	USE_INDEX="$NEXT_INDEX"
-else
-	USE_INDEX="$THIS_INDEX"
-fi
-
-case "$status_only" in
-t)
-	# This will silently fail in a read-only repository, which is
-	# what we want.
-	GIT_INDEX_FILE="$USE_INDEX" git update-index -q --unmerged --refresh
-	run_status
-	exit $?
-	;;
-'')
-	GIT_INDEX_FILE="$USE_INDEX" git update-index -q --refresh || exit
-	;;
-esac
-
-################################################################
-# Grab commit message, write out tree and make commit.
-
-if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
-then
-    GIT_INDEX_FILE="${TMP_INDEX:-${USE_INDEX}}" "$GIT_DIR"/hooks/pre-commit \
-    || exit
-fi
-
-if test "$log_message" != ''
-then
-	printf '%s\n' "$log_message"
-elif test "$logfile" != ""
-then
-	if test "$logfile" = -
-	then
-		test -t 0 &&
-		echo >&2 "(reading log message from standard input)"
-		cat
-	else
-		cat <"$logfile"
-	fi
-elif test "$use_commit" != ""
-then
-	encoding=$(git config i18n.commitencoding || echo UTF-8)
-	git show -s --pretty=raw --encoding="$encoding" "$use_commit" |
-	sed -e '1,/^$/d' -e 's/^    //'
-elif test -f "$GIT_DIR/MERGE_MSG"
-then
-	cat "$GIT_DIR/MERGE_MSG"
-elif test -f "$GIT_DIR/SQUASH_MSG"
-then
-	cat "$GIT_DIR/SQUASH_MSG"
-elif test "$templatefile" != ""
-then
-	cat "$templatefile"
-fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG
-
-case "$signoff" in
-t)
-	sign=$(git var GIT_COMMITTER_IDENT | sed -e '
-		s/>.*/>/
-		s/^/Signed-off-by: /
-		')
-	blank_before_signoff=
-	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
-	grep 'Signed-off-by:' >/dev/null || blank_before_signoff='
-'
-	tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG |
-	grep "$sign"$ >/dev/null ||
-	printf '%s%s\n' "$blank_before_signoff" "$sign" \
-		>>"$GIT_DIR"/COMMIT_EDITMSG
-	;;
-esac
-
-if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
-	echo "#"
-	echo "# It looks like you may be committing a MERGE."
-	echo "# If this is not correct, please remove the file"
-	printf '%s\n' "#	$GIT_DIR/MERGE_HEAD"
-	echo "# and try again"
-	echo "#"
-fi >>"$GIT_DIR"/COMMIT_EDITMSG
-
-# Author
-if test '' != "$use_commit"
-then
-	eval "$(get_author_ident_from_commit "$use_commit")"
-	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-fi
-if test '' != "$force_author"
-then
-	GIT_AUTHOR_NAME=$(expr "z$force_author" : 'z\(.*[^ ]\) *<.*') &&
-	GIT_AUTHOR_EMAIL=$(expr "z$force_author" : '.*\(<.*\)') &&
-	test '' != "$GIT_AUTHOR_NAME" &&
-	test '' != "$GIT_AUTHOR_EMAIL" ||
-	die "malformed --author parameter"
-	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
-fi
-
-PARENTS="-p HEAD"
-if test -z "$initial_commit"
-then
-	rloga='commit'
-	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
-		rloga='commit (merge)'
-		PARENTS="-p HEAD "$(sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD")
-	elif test -n "$amend"; then
-		rloga='commit (amend)'
-		PARENTS=$(git cat-file commit HEAD |
-			sed -n -e '/^$/q' -e 's/^parent /-p /p')
-	fi
-	current="$(git rev-parse --verify HEAD)"
-else
-	if [ -z "$(git ls-files)" ]; then
-		echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)'
-		exit 1
-	fi
-	PARENTS=""
-	rloga='commit (initial)'
-	current=''
-fi
-set_reflog_action "$rloga"
-
-if test -z "$no_edit"
-then
-	{
-		echo ""
-		echo "# Please enter the commit message for your changes."
-		echo "# (Comment lines starting with '#' will not be included)"
-		test -z "$only_include_assumed" || echo "$only_include_assumed"
-		run_status
-	} >>"$GIT_DIR"/COMMIT_EDITMSG
-else
-	# we need to check if there is anything to commit
-	run_status >/dev/null
-fi
-case "$allow_empty,$?,$PARENTS" in
-t,* | ?,0,* | ?,*,-p' '?*-p' '?*)
-	# an explicit --allow-empty, or a merge commit can record the
-	# same tree as its parent.  Otherwise having commitable paths
-	# is required.
-	;;
-*)
-	rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
-	use_status_color=t
-	run_status
-	exit 1
-esac
-
-case "$no_edit" in
-'')
-	git var GIT_AUTHOR_IDENT > /dev/null  || die
-	git var GIT_COMMITTER_IDENT > /dev/null  || die
-	git_editor "$GIT_DIR/COMMIT_EDITMSG"
-	;;
-esac
-
-case "$verify" in
-t)
-	if test -x "$GIT_DIR"/hooks/commit-msg
-	then
-		"$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
-	fi
-esac
-
-if test -z "$no_edit"
-then
-    sed -e '
-        /^diff --git a\/.*/{
-	    s///
-	    q
-	}
-	/^#/d
-    ' "$GIT_DIR"/COMMIT_EDITMSG
-else
-    cat "$GIT_DIR"/COMMIT_EDITMSG
-fi |
-git stripspace >"$GIT_DIR"/COMMIT_MSG
-
-# Test whether the commit message has any content we didn't supply.
-have_commitmsg=
-grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
-	git stripspace > "$GIT_DIR"/COMMIT_BAREMSG
-
-# Is the commit message totally empty?
-if test -s "$GIT_DIR"/COMMIT_BAREMSG
-then
-	if test "$templatefile" != ""
-	then
-		# Test whether this is just the unaltered template.
-		if cnt=$(sed -e '/^#/d' < "$templatefile" |
-			git stripspace |
-			diff "$GIT_DIR"/COMMIT_BAREMSG - |
-			wc -l) &&
-		   test 0 -lt $cnt
-		then
-			have_commitmsg=t
-		fi
-	else
-		# No template, so the content in the commit message must
-		# have come from the user.
-		have_commitmsg=t
-	fi
-fi
-
-rm -f "$GIT_DIR"/COMMIT_BAREMSG
-
-if test "$have_commitmsg" = "t"
-then
-	if test -z "$TMP_INDEX"
-	then
-		tree=$(GIT_INDEX_FILE="$USE_INDEX" git write-tree)
-	else
-		tree=$(GIT_INDEX_FILE="$TMP_INDEX" git write-tree) &&
-		rm -f "$TMP_INDEX"
-	fi &&
-	commit=$(git commit-tree $tree $PARENTS <"$GIT_DIR/COMMIT_MSG") &&
-	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
-	git update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
-	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
-	if test -f "$NEXT_INDEX"
-	then
-		mv "$NEXT_INDEX" "$THIS_INDEX"
-	else
-		: ;# happy
-	fi
-else
-	echo >&2 "* no commit message?  aborting commit."
-	false
-fi
-ret="$?"
-rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
-
-cd_to_toplevel
-
-git rerere
-
-if test "$ret" = 0
-then
-	git gc --auto
-	if test -x "$GIT_DIR"/hooks/post-commit
-	then
-		"$GIT_DIR"/hooks/post-commit
-	fi
-	if test -z "$quiet"
-	then
-		commit=$(git diff-tree --always --shortstat --pretty="format:%h: %s"\
-		       --abbrev --summary --root HEAD --)
-		echo "Created${initial_commit:+ initial} commit $commit"
-	fi
-fi
-
-exit "$ret"
diff --git a/contrib/examples/git-difftool.perl b/contrib/examples/git-difftool.perl
deleted file mode 100755
index fb0fd0b..0000000
--- a/contrib/examples/git-difftool.perl
+++ /dev/null
@@ -1,481 +0,0 @@
-#!/usr/bin/perl
-# Copyright (c) 2009, 2010 David Aguilar
-# Copyright (c) 2012 Tim Henigan
-#
-# This is a wrapper around the GIT_EXTERNAL_DIFF-compatible
-# git-difftool--helper script.
-#
-# This script exports GIT_EXTERNAL_DIFF and GIT_PAGER for use by git.
-# The GIT_DIFF* variables are exported for use by git-difftool--helper.
-#
-# Any arguments that are unknown to this script are forwarded to 'git diff'.
-
-use 5.008;
-use strict;
-use warnings;
-use Git::Error qw(:try);
-use File::Basename qw(dirname);
-use File::Copy;
-use File::Find;
-use File::stat;
-use File::Path qw(mkpath rmtree);
-use File::Temp qw(tempdir);
-use Getopt::Long qw(:config pass_through);
-use Git;
-use Git::I18N;
-
-sub usage
-{
-	my $exitcode = shift;
-	print << 'USAGE';
-usage: git difftool [-t|--tool=<tool>] [--tool-help]
-                    [-x|--extcmd=<cmd>]
-                    [-g|--gui] [--no-gui]
-                    [--prompt] [-y|--no-prompt]
-                    [-d|--dir-diff]
-                    ['git diff' options]
-USAGE
-	exit($exitcode);
-}
-
-sub print_tool_help
-{
-	# See the comment at the bottom of file_diff() for the reason behind
-	# using system() followed by exit() instead of exec().
-	my $rc = system(qw(git mergetool --tool-help=diff));
-	exit($rc | ($rc >> 8));
-}
-
-sub exit_cleanup
-{
-	my ($tmpdir, $status) = @_;
-	my $errno = $!;
-	rmtree($tmpdir);
-	if ($status and $errno) {
-		my ($package, $file, $line) = caller();
-		warn "$file line $line: $errno\n";
-	}
-	exit($status | ($status >> 8));
-}
-
-sub use_wt_file
-{
-	my ($file, $sha1) = @_;
-	my $null_sha1 = '0' x 40;
-
-	if (-l $file || ! -e _) {
-		return (0, $null_sha1);
-	}
-
-	my $wt_sha1 = Git::command_oneline('hash-object', $file);
-	my $use = ($sha1 eq $null_sha1) || ($sha1 eq $wt_sha1);
-	return ($use, $wt_sha1);
-}
-
-sub changed_files
-{
-	my ($repo_path, $index, $worktree) = @_;
-	$ENV{GIT_INDEX_FILE} = $index;
-
-	my @gitargs = ('--git-dir', $repo_path, '--work-tree', $worktree);
-	my @refreshargs = (
-		@gitargs, 'update-index',
-		'--really-refresh', '-q', '--unmerged');
-	try {
-		Git::command_oneline(@refreshargs);
-	} catch Git::Error::Command with {};
-
-	my @diffargs = (@gitargs, 'diff-files', '--name-only', '-z');
-	my $line = Git::command_oneline(@diffargs);
-	my @files;
-	if (defined $line) {
-		@files = split('\0', $line);
-	} else {
-		@files = ();
-	}
-
-	delete($ENV{GIT_INDEX_FILE});
-
-	return map { $_ => 1 } @files;
-}
-
-sub setup_dir_diff
-{
-	my ($worktree, $symlinks) = @_;
-	my @gitargs = ('diff', '--raw', '--no-abbrev', '-z', @ARGV);
-	my $diffrtn = Git::command_oneline(@gitargs);
-	exit(0) unless defined($diffrtn);
-
-	# Go to the root of the worktree now that we've captured the list of
-	# changed files.  The paths returned by diff --raw are relative to the
-	# top-level of the repository, but we defer changing directories so
-	# that @ARGV can perform pathspec limiting in the current directory.
-	chdir($worktree);
-
-	# Build index info for left and right sides of the diff
-	my $submodule_mode = '160000';
-	my $symlink_mode = '120000';
-	my $null_mode = '0' x 6;
-	my $null_sha1 = '0' x 40;
-	my $lindex = '';
-	my $rindex = '';
-	my $wtindex = '';
-	my %submodule;
-	my %symlink;
-	my @files = ();
-	my %working_tree_dups = ();
-	my @rawdiff = split('\0', $diffrtn);
-
-	my $i = 0;
-	while ($i < $#rawdiff) {
-		if ($rawdiff[$i] =~ /^::/) {
-			warn __ <<'EOF';
-Combined diff formats ('-c' and '--cc') are not supported in
-directory diff mode ('-d' and '--dir-diff').
-EOF
-			exit(1);
-		}
-
-		my ($lmode, $rmode, $lsha1, $rsha1, $status) =
-			split(' ', substr($rawdiff[$i], 1));
-		my $src_path = $rawdiff[$i + 1];
-		my $dst_path;
-
-		if ($status =~ /^[CR]/) {
-			$dst_path = $rawdiff[$i + 2];
-			$i += 3;
-		} else {
-			$dst_path = $src_path;
-			$i += 2;
-		}
-
-		if ($lmode eq $submodule_mode or $rmode eq $submodule_mode) {
-			$submodule{$src_path}{left} = $lsha1;
-			if ($lsha1 ne $rsha1) {
-				$submodule{$dst_path}{right} = $rsha1;
-			} else {
-				$submodule{$dst_path}{right} = "$rsha1-dirty";
-			}
-			next;
-		}
-
-		if ($lmode eq $symlink_mode) {
-			$symlink{$src_path}{left} =
-				Git::command_oneline('show', $lsha1);
-		}
-
-		if ($rmode eq $symlink_mode) {
-			$symlink{$dst_path}{right} =
-				Git::command_oneline('show', $rsha1);
-		}
-
-		if ($lmode ne $null_mode and $status !~ /^C/) {
-			$lindex .= "$lmode $lsha1\t$src_path\0";
-		}
-
-		if ($rmode ne $null_mode) {
-			# Avoid duplicate entries
-			if ($working_tree_dups{$dst_path}++) {
-				next;
-			}
-			my ($use, $wt_sha1) =
-				use_wt_file($dst_path, $rsha1);
-			if ($use) {
-				push @files, $dst_path;
-				$wtindex .= "$rmode $wt_sha1\t$dst_path\0";
-			} else {
-				$rindex .= "$rmode $rsha1\t$dst_path\0";
-			}
-		}
-	}
-
-	# Go to the root of the worktree so that the left index files
-	# are properly setup -- the index is toplevel-relative.
-	chdir($worktree);
-
-	# Setup temp directories
-	my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
-	my $ldir = "$tmpdir/left";
-	my $rdir = "$tmpdir/right";
-	mkpath($ldir) or exit_cleanup($tmpdir, 1);
-	mkpath($rdir) or exit_cleanup($tmpdir, 1);
-
-	# Populate the left and right directories based on each index file
-	my ($inpipe, $ctx);
-	$ENV{GIT_INDEX_FILE} = "$tmpdir/lindex";
-	($inpipe, $ctx) =
-		Git::command_input_pipe('update-index', '-z', '--index-info');
-	print($inpipe $lindex);
-	Git::command_close_pipe($inpipe, $ctx);
-
-	my $rc = system('git', 'checkout-index', '--all', "--prefix=$ldir/");
-	exit_cleanup($tmpdir, $rc) if $rc != 0;
-
-	$ENV{GIT_INDEX_FILE} = "$tmpdir/rindex";
-	($inpipe, $ctx) =
-		Git::command_input_pipe('update-index', '-z', '--index-info');
-	print($inpipe $rindex);
-	Git::command_close_pipe($inpipe, $ctx);
-
-	$rc = system('git', 'checkout-index', '--all', "--prefix=$rdir/");
-	exit_cleanup($tmpdir, $rc) if $rc != 0;
-
-	$ENV{GIT_INDEX_FILE} = "$tmpdir/wtindex";
-	($inpipe, $ctx) =
-		Git::command_input_pipe('update-index', '--info-only', '-z', '--index-info');
-	print($inpipe $wtindex);
-	Git::command_close_pipe($inpipe, $ctx);
-
-	# If $GIT_DIR was explicitly set just for the update/checkout
-	# commands, then it should be unset before continuing.
-	delete($ENV{GIT_INDEX_FILE});
-
-	# Changes in the working tree need special treatment since they are
-	# not part of the index.
-	for my $file (@files) {
-		my $dir = dirname($file);
-		unless (-d "$rdir/$dir") {
-			mkpath("$rdir/$dir") or
-			exit_cleanup($tmpdir, 1);
-		}
-		if ($symlinks) {
-			symlink("$worktree/$file", "$rdir/$file") or
-			exit_cleanup($tmpdir, 1);
-		} else {
-			copy($file, "$rdir/$file") or
-			exit_cleanup($tmpdir, 1);
-
-			my $mode = stat($file)->mode;
-			chmod($mode, "$rdir/$file") or
-			exit_cleanup($tmpdir, 1);
-		}
-	}
-
-	# Changes to submodules require special treatment. This loop writes a
-	# temporary file to both the left and right directories to show the
-	# change in the recorded SHA1 for the submodule.
-	for my $path (keys %submodule) {
-		my $ok = 0;
-		if (defined($submodule{$path}{left})) {
-			$ok = write_to_file("$ldir/$path",
-				"Subproject commit $submodule{$path}{left}");
-		}
-		if (defined($submodule{$path}{right})) {
-			$ok = write_to_file("$rdir/$path",
-				"Subproject commit $submodule{$path}{right}");
-		}
-		exit_cleanup($tmpdir, 1) if not $ok;
-	}
-
-	# Symbolic links require special treatment. The standard "git diff"
-	# shows only the link itself, not the contents of the link target.
-	# This loop replicates that behavior.
-	for my $path (keys %symlink) {
-		my $ok = 0;
-		if (defined($symlink{$path}{left})) {
-			$ok = write_to_file("$ldir/$path",
-					$symlink{$path}{left});
-		}
-		if (defined($symlink{$path}{right})) {
-			$ok = write_to_file("$rdir/$path",
-					$symlink{$path}{right});
-		}
-		exit_cleanup($tmpdir, 1) if not $ok;
-	}
-
-	return ($ldir, $rdir, $tmpdir, @files);
-}
-
-sub write_to_file
-{
-	my $path = shift;
-	my $value = shift;
-
-	# Make sure the path to the file exists
-	my $dir = dirname($path);
-	unless (-d "$dir") {
-		mkpath("$dir") or return 0;
-	}
-
-	# If the file already exists in that location, delete it.  This
-	# is required in the case of symbolic links.
-	unlink($path);
-
-	open(my $fh, '>', $path) or return 0;
-	print($fh $value);
-	close($fh);
-
-	return 1;
-}
-
-sub main
-{
-	# parse command-line options. all unrecognized options and arguments
-	# are passed through to the 'git diff' command.
-	my %opts = (
-		difftool_cmd => undef,
-		dirdiff => undef,
-		extcmd => undef,
-		gui => undef,
-		help => undef,
-		prompt => undef,
-		symlinks => $^O ne 'cygwin' &&
-				$^O ne 'MSWin32' && $^O ne 'msys',
-		tool_help => undef,
-		trust_exit_code => undef,
-	);
-	GetOptions('g|gui!' => \$opts{gui},
-		'd|dir-diff' => \$opts{dirdiff},
-		'h' => \$opts{help},
-		'prompt!' => \$opts{prompt},
-		'y' => sub { $opts{prompt} = 0; },
-		'symlinks' => \$opts{symlinks},
-		'no-symlinks' => sub { $opts{symlinks} = 0; },
-		't|tool:s' => \$opts{difftool_cmd},
-		'tool-help' => \$opts{tool_help},
-		'trust-exit-code' => \$opts{trust_exit_code},
-		'no-trust-exit-code' => sub { $opts{trust_exit_code} = 0; },
-		'x|extcmd:s' => \$opts{extcmd});
-
-	if (defined($opts{help})) {
-		usage(0);
-	}
-	if (defined($opts{tool_help})) {
-		print_tool_help();
-	}
-	if (defined($opts{difftool_cmd})) {
-		if (length($opts{difftool_cmd}) > 0) {
-			$ENV{GIT_DIFF_TOOL} = $opts{difftool_cmd};
-		} else {
-			print __("No <tool> given for --tool=<tool>\n");
-			usage(1);
-		}
-	}
-	if (defined($opts{extcmd})) {
-		if (length($opts{extcmd}) > 0) {
-			$ENV{GIT_DIFFTOOL_EXTCMD} = $opts{extcmd};
-		} else {
-			print __("No <cmd> given for --extcmd=<cmd>\n");
-			usage(1);
-		}
-	}
-	if ($opts{gui}) {
-		my $guitool = Git::config('diff.guitool');
-		if (defined($guitool) && length($guitool) > 0) {
-			$ENV{GIT_DIFF_TOOL} = $guitool;
-		}
-	}
-
-	if (!defined $opts{trust_exit_code}) {
-		$opts{trust_exit_code} = Git::config_bool('difftool.trustExitCode');
-	}
-	if ($opts{trust_exit_code}) {
-		$ENV{GIT_DIFFTOOL_TRUST_EXIT_CODE} = 'true';
-	} else {
-		$ENV{GIT_DIFFTOOL_TRUST_EXIT_CODE} = 'false';
-	}
-
-	# In directory diff mode, 'git-difftool--helper' is called once
-	# to compare the a/b directories.  In file diff mode, 'git diff'
-	# will invoke a separate instance of 'git-difftool--helper' for
-	# each file that changed.
-	if (defined($opts{dirdiff})) {
-		dir_diff($opts{extcmd}, $opts{symlinks});
-	} else {
-		file_diff($opts{prompt});
-	}
-}
-
-sub dir_diff
-{
-	my ($extcmd, $symlinks) = @_;
-	my $rc;
-	my $error = 0;
-	my $repo = Git->repository();
-	my $repo_path = $repo->repo_path();
-	my $worktree = $repo->wc_path();
-	$worktree =~ s|/$||; # Avoid double slashes in symlink targets
-	my ($a, $b, $tmpdir, @files) = setup_dir_diff($worktree, $symlinks);
-
-	if (defined($extcmd)) {
-		$rc = system($extcmd, $a, $b);
-	} else {
-		$ENV{GIT_DIFFTOOL_DIRDIFF} = 'true';
-		$rc = system('git', 'difftool--helper', $a, $b);
-	}
-	# If the diff including working copy files and those
-	# files were modified during the diff, then the changes
-	# should be copied back to the working tree.
-	# Do not copy back files when symlinks are used and the
-	# external tool did not replace the original link with a file.
-	#
-	# These hashes are loaded lazily since they aren't needed
-	# in the common case of --symlinks and the difftool updating
-	# files through the symlink.
-	my %wt_modified;
-	my %tmp_modified;
-	my $indices_loaded = 0;
-
-	for my $file (@files) {
-		next if $symlinks && -l "$b/$file";
-		next if ! -f "$b/$file";
-
-		if (!$indices_loaded) {
-			%wt_modified = changed_files(
-				$repo_path, "$tmpdir/wtindex", $worktree);
-			%tmp_modified = changed_files(
-				$repo_path, "$tmpdir/wtindex", $b);
-			$indices_loaded = 1;
-		}
-
-		if (exists $wt_modified{$file} and exists $tmp_modified{$file}) {
-			warn sprintf(__(
-				"warning: Both files modified:\n" .
-				"'%s/%s' and '%s/%s'.\n" .
-				"warning: Working tree file has been left.\n" .
-				"warning:\n"), $worktree, $file, $b, $file);
-			$error = 1;
-		} elsif (exists $tmp_modified{$file}) {
-			my $mode = stat("$b/$file")->mode;
-			copy("$b/$file", $file) or
-			exit_cleanup($tmpdir, 1);
-
-			chmod($mode, $file) or
-			exit_cleanup($tmpdir, 1);
-		}
-	}
-	if ($error) {
-		warn sprintf(__(
-			"warning: Temporary files exist in '%s'.\n" .
-			"warning: You may want to cleanup or recover these.\n"), $tmpdir);
-		exit(1);
-	} else {
-		exit_cleanup($tmpdir, $rc);
-	}
-}
-
-sub file_diff
-{
-	my ($prompt) = @_;
-
-	if (defined($prompt)) {
-		if ($prompt) {
-			$ENV{GIT_DIFFTOOL_PROMPT} = 'true';
-		} else {
-			$ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true';
-		}
-	}
-
-	$ENV{GIT_PAGER} = '';
-	$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
-
-	# ActiveState Perl for Win32 does not implement POSIX semantics of
-	# exec* system call. It just spawns the given executable and finishes
-	# the starting program, exiting with code 0.
-	# system will at least catch the errors returned by git diff,
-	# allowing the caller of git difftool better handling of failures.
-	my $rc = system('git', 'diff', @ARGV);
-	exit($rc | ($rc >> 8));
-}
-
-main();
diff --git a/contrib/examples/git-fetch.sh b/contrib/examples/git-fetch.sh
deleted file mode 100755
index 57d2e56..0000000
--- a/contrib/examples/git-fetch.sh
+++ /dev/null
@@ -1,379 +0,0 @@
-#!/bin/sh
-#
-
-USAGE='<fetch-options> <repository> <refspec>...'
-SUBDIRECTORY_OK=Yes
-. git-sh-setup
-set_reflog_action "fetch $*"
-cd_to_toplevel ;# probably unnecessary...
-
-. git-parse-remote
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
-
-LF='
-'
-IFS="$LF"
-
-no_tags=
-tags=
-append=
-force=
-verbose=
-update_head_ok=
-exec=
-keep=
-shallow_depth=
-no_progress=
-test -t 1 || no_progress=--no-progress
-quiet=
-while test $# != 0
-do
-	case "$1" in
-	-a|--a|--ap|--app|--appe|--appen|--append)
-		append=t
-		;;
-	--upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
-	--upload-pa|--upload-pac|--upload-pack)
-		shift
-		exec="--upload-pack=$1"
-		;;
-	--upl=*|--uplo=*|--uploa=*|--upload=*|\
-	--upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*)
-		exec=--upload-pack=$(expr "z$1" : 'z-[^=]*=\(.*\)')
-		shift
-		;;
-	-f|--f|--fo|--for|--forc|--force)
-		force=t
-		;;
-	-t|--t|--ta|--tag|--tags)
-		tags=t
-		;;
-	-n|--n|--no|--no-|--no-t|--no-ta|--no-tag|--no-tags)
-		no_tags=t
-		;;
-	-u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\
-	--update-he|--update-hea|--update-head|--update-head-|\
-	--update-head-o|--update-head-ok)
-		update_head_ok=t
-		;;
-	-q|--q|--qu|--qui|--quie|--quiet)
-		quiet=--quiet
-		;;
-	-v|--verbose)
-		verbose="$verbose"Yes
-		;;
-	-k|--k|--ke|--kee|--keep)
-		keep='-k -k'
-		;;
-	--depth=*)
-		shallow_depth="--depth=$(expr "z$1" : 'z-[^=]*=\(.*\)')"
-		;;
-	--depth)
-		shift
-		shallow_depth="--depth=$1"
-		;;
-	-*)
-		usage
-		;;
-	*)
-		break
-		;;
-	esac
-	shift
-done
-
-case "$#" in
-0)
-	origin=$(get_default_remote)
-	test -n "$(get_remote_url ${origin})" ||
-		die "Where do you want to fetch from today?"
-	set x $origin ; shift ;;
-esac
-
-if test -z "$exec"
-then
-	# No command line override and we have configuration for the remote.
-	exec="--upload-pack=$(get_uploadpack $1)"
-fi
-
-remote_nick="$1"
-remote=$(get_remote_url "$@")
-refs=
-rref=
-rsync_slurped_objects=
-
-if test "" = "$append"
-then
-	: >"$GIT_DIR/FETCH_HEAD"
-fi
-
-# Global that is reused later
-ls_remote_result=$(git ls-remote $exec "$remote") ||
-	die "Cannot get the repository state from $remote"
-
-append_fetch_head () {
-	flags=
-	test -n "$verbose" && flags="$flags$LF-v"
-	test -n "$force$single_force" && flags="$flags$LF-f"
-	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
-		git fetch--tool $flags append-fetch-head "$@"
-}
-
-# updating the current HEAD with git-fetch in a bare
-# repository is always fine.
-if test -z "$update_head_ok" && test $(is_bare_repository) = false
-then
-	orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
-fi
-
-# Allow --tags/--notags from remote.$1.tagopt
-case "$tags$no_tags" in
-'')
-	case "$(git config --get "remote.$1.tagopt")" in
-	--tags)
-		tags=t ;;
-	--no-tags)
-		no_tags=t ;;
-	esac
-esac
-
-# If --tags (and later --heads or --all) is specified, then we are
-# not talking about defaults stored in Pull: line of remotes or
-# branches file, and just fetch those and refspecs explicitly given.
-# Otherwise we do what we always did.
-
-reflist=$(get_remote_refs_for_fetch "$@")
-if test "$tags"
-then
-	taglist=$(IFS='	' &&
-		  echo "$ls_remote_result" |
-		  git show-ref --exclude-existing=refs/tags/ |
-	          while read sha1 name
-		  do
-			echo ".${name}:${name}"
-		  done) || exit
-	if test "$#" -gt 1
-	then
-		# remote URL plus explicit refspecs; we need to merge them.
-		reflist="$reflist$LF$taglist"
-	else
-		# No explicit refspecs; fetch tags only.
-		reflist=$taglist
-	fi
-fi
-
-fetch_all_at_once () {
-
-  eval=$(echo "$1" | git fetch--tool parse-reflist "-")
-  eval "$eval"
-
-    ( : subshell because we muck with IFS
-      IFS=" 	$LF"
-      (
-	if test "$remote" = . ; then
-	    git show-ref $rref || echo failed "$remote"
-	elif test -f "$remote" ; then
-	    test -n "$shallow_depth" &&
-		die "shallow clone with bundle is not supported"
-	    git bundle unbundle "$remote" $rref ||
-	    echo failed "$remote"
-	else
-		if	test -d "$remote" &&
-
-			# The remote might be our alternate.  With
-			# this optimization we will bypass fetch-pack
-			# altogether, which means we cannot be doing
-			# the shallow stuff at all.
-			test ! -f "$GIT_DIR/shallow" &&
-			test -z "$shallow_depth" &&
-
-			# See if all of what we are going to fetch are
-			# connected to our repository's tips, in which
-			# case we do not have to do any fetch.
-			theirs=$(echo "$ls_remote_result" | \
-				git fetch--tool -s pick-rref "$rref" "-") &&
-
-			# This will barf when $theirs reach an object that
-			# we do not have in our repository.  Otherwise,
-			# we already have everything the fetch would bring in.
-			git rev-list --objects $theirs --not --all \
-				>/dev/null 2>/dev/null
-		then
-			echo "$ls_remote_result" | \
-				git fetch--tool pick-rref "$rref" "-"
-		else
-			flags=
-			case $verbose in
-			YesYes*)
-			    flags="-v"
-			    ;;
-			esac
-			git-fetch-pack --thin $exec $keep $shallow_depth \
-				$quiet $no_progress $flags "$remote" $rref ||
-			echo failed "$remote"
-		fi
-	fi
-      ) |
-      (
-	flags=
-	test -n "$verbose" && flags="$flags -v"
-	test -n "$force" && flags="$flags -f"
-	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
-		git fetch--tool $flags native-store \
-			"$remote" "$remote_nick" "$refs"
-      )
-    ) || exit
-
-}
-
-fetch_per_ref () {
-  reflist="$1"
-  refs=
-  rref=
-
-  for ref in $reflist
-  do
-      refs="$refs$LF$ref"
-
-      # These are relative path from $GIT_DIR, typically starting at refs/
-      # but may be HEAD
-      if expr "z$ref" : 'z\.' >/dev/null
-      then
-	  not_for_merge=t
-	  ref=$(expr "z$ref" : 'z\.\(.*\)')
-      else
-	  not_for_merge=
-      fi
-      if expr "z$ref" : 'z+' >/dev/null
-      then
-	  single_force=t
-	  ref=$(expr "z$ref" : 'z+\(.*\)')
-      else
-	  single_force=
-      fi
-      remote_name=$(expr "z$ref" : 'z\([^:]*\):')
-      local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)')
-
-      rref="$rref$LF$remote_name"
-
-      # There are transports that can fetch only one head at a time...
-      case "$remote" in
-      http://* | https://* | ftp://*)
-	  test -n "$shallow_depth" &&
-		die "shallow clone with http not supported"
-	  proto=$(expr "$remote" : '\([^:]*\):')
-	  if [ -n "$GIT_SSL_NO_VERIFY" ]; then
-	      curl_extra_args="-k"
-	  fi
-	  if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
-		"$(git config --bool http.noEPSV)" = true ]; then
-	      noepsv_opt="--disable-epsv"
-	  fi
-
-	  # Find $remote_name from ls-remote output.
-	  head=$(echo "$ls_remote_result" | \
-		git fetch--tool -s pick-rref "$remote_name" "-")
-	  expr "z$head" : "z$_x40\$" >/dev/null ||
-		die "No such ref $remote_name at $remote"
-	  echo >&2 "Fetching $remote_name from $remote using $proto"
-	  case "$quiet" in '') v=-v ;; *) v= ;; esac
-	  git-http-fetch $v -a "$head" "$remote" || exit
-	  ;;
-      rsync://*)
-	  test -n "$shallow_depth" &&
-		die "shallow clone with rsync not supported"
-	  TMP_HEAD="$GIT_DIR/TMP_HEAD"
-	  rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1
-	  head=$(git rev-parse --verify TMP_HEAD)
-	  rm -f "$TMP_HEAD"
-	  case "$quiet" in '') v=-v ;; *) v= ;; esac
-	  test "$rsync_slurped_objects" || {
-	      rsync -a $v --ignore-existing --exclude info \
-		  "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit
-
-	      # Look at objects/info/alternates for rsync -- http will
-	      # support it natively and git native ones will do it on
-	      # the remote end.  Not having that file is not a crime.
-	      rsync -q "$remote/objects/info/alternates" \
-		  "$GIT_DIR/TMP_ALT" 2>/dev/null ||
-		  rm -f "$GIT_DIR/TMP_ALT"
-	      if test -f "$GIT_DIR/TMP_ALT"
-	      then
-		  resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |
-		  while read alt
-		  do
-		      case "$alt" in 'bad alternate: '*) die "$alt";; esac
-		      echo >&2 "Getting alternate: $alt"
-		      rsync -av --ignore-existing --exclude info \
-		      "$alt" "$GIT_OBJECT_DIRECTORY/" || exit
-		  done
-		  rm -f "$GIT_DIR/TMP_ALT"
-	      fi
-	      rsync_slurped_objects=t
-	  }
-	  ;;
-      esac
-
-      append_fetch_head "$head" "$remote" \
-	  "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" || exit
-
-  done
-
-}
-
-fetch_main () {
-	case "$remote" in
-	http://* | https://* | ftp://* | rsync://* )
-		fetch_per_ref "$@"
-		;;
-	*)
-		fetch_all_at_once "$@"
-		;;
-	esac
-}
-
-fetch_main "$reflist" || exit
-
-# automated tag following
-case "$no_tags$tags" in
-'')
-	case "$reflist" in
-	*:refs/*)
-		# effective only when we are following remote branch
-		# using local tracking branch.
-		taglist=$(IFS='	' &&
-		echo "$ls_remote_result" |
-		git show-ref --exclude-existing=refs/tags/ |
-		while read sha1 name
-		do
-			git cat-file -t "$sha1" >/dev/null 2>&1 || continue
-			echo >&2 "Auto-following $name"
-			echo ".${name}:${name}"
-		done)
-	esac
-	case "$taglist" in
-	'') ;;
-	?*)
-		# do not deepen a shallow tree when following tags
-		shallow_depth=
-		fetch_main "$taglist" || exit ;;
-	esac
-esac
-
-# If the original head was empty (i.e. no "master" yet), or
-# if we were told not to worry, we do not have to check.
-case "$orig_head" in
-'')
-	;;
-?*)
-	curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
-	if test "$curr_head" != "$orig_head"
-	then
-	    git update-ref \
-			-m "$GIT_REFLOG_ACTION: Undoing incorrectly fetched HEAD." \
-			HEAD "$orig_head"
-		die "Cannot fetch into the current branch."
-	fi
-	;;
-esac
diff --git a/contrib/examples/git-gc.sh b/contrib/examples/git-gc.sh
deleted file mode 100755
index 1597e9f..0000000
--- a/contrib/examples/git-gc.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, Shawn O. Pearce
-#
-# Cleanup unreachable files and optimize the repository.
-
-USAGE='[--prune]'
-SUBDIRECTORY_OK=Yes
-. git-sh-setup
-
-no_prune=:
-while test $# != 0
-do
-	case "$1" in
-	--prune)
-		no_prune=
-		;;
-	--)
-		usage
-		;;
-	esac
-	shift
-done
-
-case "$(git config --get gc.packrefs)" in
-notbare|"")
-	test $(is_bare_repository) = true || pack_refs=true;;
-*)
-	pack_refs=$(git config --bool --get gc.packrefs)
-esac
-
-test "true" != "$pack_refs" ||
-git pack-refs --prune &&
-git reflog expire --all &&
-git-repack -a -d -l &&
-$no_prune git prune &&
-git rerere gc || exit
diff --git a/contrib/examples/git-log.sh b/contrib/examples/git-log.sh
deleted file mode 100755
index c2ea71c..0000000
--- a/contrib/examples/git-log.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-#
-
-USAGE='[--max-count=<n>] [<since>..<limit>] [--pretty=<format>] [git-rev-list options]'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-revs=$(git-rev-parse --revs-only --no-flags --default HEAD "$@") || exit
-[ "$revs" ] || {
-	die "No HEAD ref"
-}
-git-rev-list --pretty $(git-rev-parse --default HEAD "$@") |
-LESS=-S ${PAGER:-less}
diff --git a/contrib/examples/git-ls-remote.sh b/contrib/examples/git-ls-remote.sh
deleted file mode 100755
index 2aa89a7..0000000
--- a/contrib/examples/git-ls-remote.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-#
-
-usage () {
-    echo >&2 "usage: $0 [--heads] [--tags] [-u|--upload-pack <upload-pack>]"
-    echo >&2 "          <repository> <refs>..."
-    exit 1;
-}
-
-die () {
-    echo >&2 "$*"
-    exit 1
-}
-
-exec=
-while test $# != 0
-do
-  case "$1" in
-  -h|--h|--he|--hea|--head|--heads)
-  heads=heads; shift ;;
-  -t|--t|--ta|--tag|--tags)
-  tags=tags; shift ;;
-  -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\
-  --upload-pac|--upload-pack)
-	shift
-	exec="--upload-pack=$1"
-	shift;;
-  -u=*|--u=*|--up=*|--upl=*|--uplo=*|--uploa=*|--upload=*|\
-  --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*)
-	exec=--upload-pack=$(expr "z$1" : 'z-[^=]*=\(.*\)')
-	shift;;
-  --)
-  shift; break ;;
-  -*)
-  usage ;;
-  *)
-  break ;;
-  esac
-done
-
-case "$#" in 0) usage ;; esac
-
-case ",$heads,$tags," in
-,,,) heads=heads tags=tags other=other ;;
-esac
-
-. git-parse-remote
-peek_repo="$(get_remote_url "$@")"
-shift
-
-tmp=.ls-remote-$$
-trap "rm -fr $tmp-*" 0 1 2 3 15
-tmpdir=$tmp-d
-
-case "$peek_repo" in
-http://* | https://* | ftp://* )
-	if [ -n "$GIT_SSL_NO_VERIFY" -o \
-		"$(git config --bool http.sslVerify)" = false ]; then
-		curl_extra_args="-k"
-	fi
-	if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
-		"$(git config --bool http.noEPSV)" = true ]; then
-		curl_extra_args="${curl_extra_args} --disable-epsv"
-	fi
-	curl -nsf $curl_extra_args --header "Pragma: no-cache" "$peek_repo/info/refs" ||
-		echo "failed	slurping"
-	;;
-
-rsync://* )
-	mkdir $tmpdir &&
-	rsync -rlq "$peek_repo/HEAD" $tmpdir &&
-	rsync -rq "$peek_repo/refs" $tmpdir || {
-		echo "failed	slurping"
-		exit
-	}
-	head=$(cat "$tmpdir/HEAD") &&
-	case "$head" in
-	ref:' '*)
-		head=$(expr "z$head" : 'zref: \(.*\)') &&
-		head=$(cat "$tmpdir/$head") || exit
-	esac &&
-	echo "$head	HEAD"
-	(cd $tmpdir && find refs -type f) |
-	while read path
-	do
-		tr -d '\012' <"$tmpdir/$path"
-		echo "	$path"
-	done &&
-	rm -fr $tmpdir
-	;;
-
-* )
-	if test -f "$peek_repo" ; then
-		git bundle list-heads "$peek_repo" ||
-		echo "failed	slurping"
-	else
-		git-peek-remote $exec "$peek_repo" ||
-		echo "failed	slurping"
-	fi
-	;;
-esac |
-sort -t '	' -k 2 |
-while read sha1 path
-do
-	case "$sha1" in
-	failed)
-		exit 1 ;;
-	esac
-	case "$path" in
-	refs/heads/*)
-		group=heads ;;
-	refs/tags/*)
-		group=tags ;;
-	*)
-		group=other ;;
-	esac
-	case ",$heads,$tags,$other," in
-	*,$group,*)
-		;;
-	*)
-		continue;;
-	esac
-	case "$#" in
-	0)
-		match=yes ;;
-	*)
-		match=no
-		for pat
-		do
-			case "/$path" in
-			*/$pat )
-				match=yes
-				break ;;
-			esac
-		done
-	esac
-	case "$match" in
-	no)
-		continue ;;
-	esac
-	echo "$sha1	$path"
-done
diff --git a/contrib/examples/git-merge-ours.sh b/contrib/examples/git-merge-ours.sh
deleted file mode 100755
index 29dba4b..0000000
--- a/contrib/examples/git-merge-ours.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Junio C Hamano
-#
-# Pretend we resolved the heads, but declare our tree trumps everybody else.
-#
-
-# We need to exit with 2 if the index does not match our HEAD tree,
-# because the current index is what we will be committing as the
-# merge result.
-
-git diff-index --quiet --cached HEAD -- || exit 2
-
-exit 0
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
deleted file mode 100755
index 932e78d..0000000
--- a/contrib/examples/git-merge.sh
+++ /dev/null
@@ -1,620 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Junio C Hamano
-#
-
-OPTIONS_KEEPDASHDASH=
-OPTIONS_SPEC="\
-git merge [options] <remote>...
-git merge [options] <msg> HEAD <remote>
---
-stat                 show a diffstat at the end of the merge
-n                    don't show a diffstat at the end of the merge
-summary              (synonym to --stat)
-log                  add list of one-line log to merge commit message
-squash               create a single commit instead of doing a merge
-commit               perform a commit if the merge succeeds (default)
-ff                   allow fast-forward (default)
-ff-only              abort if fast-forward is not possible
-rerere-autoupdate    update index with any reused conflict resolution
-s,strategy=          merge strategy to use
-X=                   option for selected merge strategy
-m,message=           message to be used for the merge commit (if any)
-"
-
-SUBDIRECTORY_OK=Yes
-. git-sh-setup
-require_work_tree
-cd_to_toplevel
-
-test -z "$(git ls-files -u)" ||
-	die "Merge is not possible because you have unmerged files."
-
-! test -e "$GIT_DIR/MERGE_HEAD" ||
-	die 'You have not concluded your merge (MERGE_HEAD exists).'
-
-LF='
-'
-
-all_strategies='recur recursive octopus resolve stupid ours subtree'
-all_strategies="$all_strategies recursive-ours recursive-theirs"
-not_strategies='base file index tree'
-default_twohead_strategies='recursive'
-default_octopus_strategies='octopus'
-no_fast_forward_strategies='subtree ours'
-no_trivial_strategies='recursive recur subtree ours recursive-ours recursive-theirs'
-use_strategies=
-xopt=
-
-allow_fast_forward=t
-fast_forward_only=
-allow_trivial_merge=t
-squash= no_commit= log_arg= rr_arg=
-
-dropsave() {
-	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
-		 "$GIT_DIR/MERGE_STASH" "$GIT_DIR/MERGE_MODE" || exit 1
-}
-
-savestate() {
-	# Stash away any local modifications.
-	git stash create >"$GIT_DIR/MERGE_STASH"
-}
-
-restorestate() {
-        if test -f "$GIT_DIR/MERGE_STASH"
-	then
-		git reset --hard $head >/dev/null
-		git stash apply $(cat "$GIT_DIR/MERGE_STASH")
-		git update-index --refresh >/dev/null
-	fi
-}
-
-finish_up_to_date () {
-	case "$squash" in
-	t)
-		echo "$1 (nothing to squash)" ;;
-	'')
-		echo "$1" ;;
-	esac
-	dropsave
-}
-
-squash_message () {
-	echo Squashed commit of the following:
-	echo
-	git log --no-merges --pretty=medium ^"$head" $remoteheads
-}
-
-finish () {
-	if test '' = "$2"
-	then
-		rlogm="$GIT_REFLOG_ACTION"
-	else
-		echo "$2"
-		rlogm="$GIT_REFLOG_ACTION: $2"
-	fi
-	case "$squash" in
-	t)
-		echo "Squash commit -- not updating HEAD"
-		squash_message >"$GIT_DIR/SQUASH_MSG"
-		;;
-	'')
-		case "$merge_msg" in
-		'')
-			echo "No merge message -- not updating HEAD"
-			;;
-		*)
-			git update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
-			git gc --auto
-			;;
-		esac
-		;;
-	esac
-	case "$1" in
-	'')
-		;;
-	?*)
-		if test "$show_diffstat" = t
-		then
-			# We want color (if set), but no pager
-			GIT_PAGER='' git diff --stat --summary -M "$head" "$1"
-		fi
-		;;
-	esac
-
-	# Run a post-merge hook
-        if test -x "$GIT_DIR"/hooks/post-merge
-        then
-	    case "$squash" in
-	    t)
-                "$GIT_DIR"/hooks/post-merge 1
-		;;
-	    '')
-                "$GIT_DIR"/hooks/post-merge 0
-		;;
-	    esac
-        fi
-}
-
-merge_name () {
-	remote="$1"
-	rh=$(git rev-parse --verify "$remote^0" 2>/dev/null) || return
-	if truname=$(expr "$remote" : '\(.*\)~[0-9]*$') &&
-		git show-ref -q --verify "refs/heads/$truname" 2>/dev/null
-	then
-		echo "$rh		branch '$truname' (early part) of ."
-		return
-	fi
-	if found_ref=$(git rev-parse --symbolic-full-name --verify \
-							"$remote" 2>/dev/null)
-	then
-		expanded=$(git check-ref-format --branch "$remote") ||
-			exit
-		if test "${found_ref#refs/heads/}" != "$found_ref"
-		then
-			echo "$rh		branch '$expanded' of ."
-			return
-		elif test "${found_ref#refs/remotes/}" != "$found_ref"
-		then
-			echo "$rh		remote branch '$expanded' of ."
-			return
-		fi
-	fi
-	if test "$remote" = "FETCH_HEAD" && test -r "$GIT_DIR/FETCH_HEAD"
-	then
-		sed -e 's/	not-for-merge	/		/' -e 1q \
-			"$GIT_DIR/FETCH_HEAD"
-		return
-	fi
-	echo "$rh		commit '$remote'"
-}
-
-parse_config () {
-	while test $# != 0; do
-		case "$1" in
-		-n|--no-stat|--no-summary)
-			show_diffstat=false ;;
-		--stat|--summary)
-			show_diffstat=t ;;
-		--log|--no-log)
-			log_arg=$1 ;;
-		--squash)
-			test "$allow_fast_forward" = t ||
-				die "You cannot combine --squash with --no-ff."
-			squash=t no_commit=t ;;
-		--no-squash)
-			squash= no_commit= ;;
-		--commit)
-			no_commit= ;;
-		--no-commit)
-			no_commit=t ;;
-		--ff)
-			allow_fast_forward=t ;;
-		--no-ff)
-			test "$squash" != t ||
-				die "You cannot combine --squash with --no-ff."
-			test "$fast_forward_only" != t ||
-				die "You cannot combine --ff-only with --no-ff."
-			allow_fast_forward=f ;;
-		--ff-only)
-			test "$allow_fast_forward" != f ||
-				die "You cannot combine --ff-only with --no-ff."
-			fast_forward_only=t ;;
-		--rerere-autoupdate|--no-rerere-autoupdate)
-			rr_arg=$1 ;;
-		-s|--strategy)
-			shift
-			case " $all_strategies " in
-			*" $1 "*)
-				use_strategies="$use_strategies$1 "
-				;;
-			*)
-				case " $not_strategies " in
-				*" $1 "*)
-					false
-				esac &&
-				type "git-merge-$1" >/dev/null 2>&1 ||
-					die "available strategies are: $all_strategies"
-				use_strategies="$use_strategies$1 "
-				;;
-			esac
-			;;
-		-X)
-			shift
-			xopt="${xopt:+$xopt }$(git rev-parse --sq-quote "--$1")"
-			;;
-		-m|--message)
-			shift
-			merge_msg="$1"
-			have_message=t
-			;;
-		--)
-			shift
-			break ;;
-		*)	usage ;;
-		esac
-		shift
-	done
-	args_left=$#
-}
-
-test $# != 0 || usage
-
-have_message=
-
-if branch=$(git-symbolic-ref -q HEAD)
-then
-	mergeopts=$(git config "branch.${branch#refs/heads/}.mergeoptions")
-	if test -n "$mergeopts"
-	then
-		parse_config $mergeopts --
-	fi
-fi
-
-parse_config "$@"
-while test $args_left -lt $#; do shift; done
-
-if test -z "$show_diffstat"; then
-    test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
-    test "$(git config --bool merge.stat)" = false && show_diffstat=false
-    test -z "$show_diffstat" && show_diffstat=t
-fi
-
-# This could be traditional "merge <msg> HEAD <commit>..."  and the
-# way we can tell it is to see if the second token is HEAD, but some
-# people might have misused the interface and used a commit-ish that
-# is the same as HEAD there instead.  Traditional format never would
-# have "-m" so it is an additional safety measure to check for it.
-
-if test -z "$have_message" &&
-	second_token=$(git rev-parse --verify "$2^0" 2>/dev/null) &&
-	head_commit=$(git rev-parse --verify "HEAD" 2>/dev/null) &&
-	test "$second_token" = "$head_commit"
-then
-	merge_msg="$1"
-	shift
-	head_arg="$1"
-	shift
-elif ! git rev-parse --verify HEAD >/dev/null 2>&1
-then
-	# If the merged head is a valid one there is no reason to
-	# forbid "git merge" into a branch yet to be born.  We do
-	# the same for "git pull".
-	if test 1 -ne $#
-	then
-		echo >&2 "Can merge only exactly one commit into empty head"
-		exit 1
-	fi
-
-	test "$squash" != t ||
-		die "Squash commit into empty head not supported yet"
-	test "$allow_fast_forward" = t ||
-		die "Non-fast-forward into an empty head does not make sense"
-	rh=$(git rev-parse --verify "$1^0") ||
-		die "$1 - not something we can merge"
-
-	git update-ref -m "initial pull" HEAD "$rh" "" &&
-	git read-tree --reset -u HEAD
-	exit
-
-else
-	# We are invoked directly as the first-class UI.
-	head_arg=HEAD
-
-	# All the rest are the commits being merged; prepare
-	# the standard merge summary message to be appended to
-	# the given message.  If remote is invalid we will die
-	# later in the common codepath so we discard the error
-	# in this loop.
-	merge_msg="$(
-		for remote
-		do
-			merge_name "$remote"
-		done |
-		if test "$have_message" = t
-		then
-			git fmt-merge-msg -m "$merge_msg" $log_arg
-		else
-			git fmt-merge-msg $log_arg
-		fi
-	)"
-fi
-head=$(git rev-parse --verify "$head_arg"^0) || usage
-
-# All the rest are remote heads
-test "$#" = 0 && usage ;# we need at least one remote head.
-set_reflog_action "merge $*"
-
-remoteheads=
-for remote
-do
-	remotehead=$(git rev-parse --verify "$remote"^0 2>/dev/null) ||
-	    die "$remote - not something we can merge"
-	remoteheads="${remoteheads}$remotehead "
-	eval GITHEAD_$remotehead='"$remote"'
-	export GITHEAD_$remotehead
-done
-set x $remoteheads ; shift
-
-case "$use_strategies" in
-'')
-	case "$#" in
-	1)
-		var="$(git config --get pull.twohead)"
-		if test -n "$var"
-		then
-			use_strategies="$var"
-		else
-			use_strategies="$default_twohead_strategies"
-		fi ;;
-	*)
-		var="$(git config --get pull.octopus)"
-		if test -n "$var"
-		then
-			use_strategies="$var"
-		else
-			use_strategies="$default_octopus_strategies"
-		fi ;;
-	esac
-	;;
-esac
-
-for s in $use_strategies
-do
-	for ss in $no_fast_forward_strategies
-	do
-		case " $s " in
-		*" $ss "*)
-			allow_fast_forward=f
-			break
-			;;
-		esac
-	done
-	for ss in $no_trivial_strategies
-	do
-		case " $s " in
-		*" $ss "*)
-			allow_trivial_merge=f
-			break
-			;;
-		esac
-	done
-done
-
-case "$#" in
-1)
-	common=$(git merge-base --all $head "$@")
-	;;
-*)
-	common=$(git merge-base --all --octopus $head "$@")
-	;;
-esac
-echo "$head" >"$GIT_DIR/ORIG_HEAD"
-
-case "$allow_fast_forward,$#,$common,$no_commit" in
-?,*,'',*)
-	# No common ancestors found. We need a real merge.
-	;;
-?,1,"$1",*)
-	# If head can reach all the merge then we are up to date.
-	# but first the most common case of merging one remote.
-	finish_up_to_date "Already up to date."
-	exit 0
-	;;
-t,1,"$head",*)
-	# Again the most common case of merging one remote.
-	echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
-	git update-index --refresh 2>/dev/null
-	msg="Fast-forward"
-	if test -n "$have_message"
-	then
-		msg="$msg (no commit created; -m option ignored)"
-	fi
-	new_head=$(git rev-parse --verify "$1^0") &&
-	git read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-	finish "$new_head" "$msg" || exit
-	dropsave
-	exit 0
-	;;
-?,1,?*"$LF"?*,*)
-	# We are not doing octopus and not fast-forward.  Need a
-	# real merge.
-	;;
-?,1,*,)
-	# We are not doing octopus, not fast-forward, and have only
-	# one common.
-	git update-index --refresh 2>/dev/null
-	case "$allow_trivial_merge,$fast_forward_only" in
-	t,)
-		# See if it is really trivial.
-		git var GIT_COMMITTER_IDENT >/dev/null || exit
-		echo "Trying really trivial in-index merge..."
-		if git read-tree --trivial -m -u -v $common $head "$1" &&
-		   result_tree=$(git write-tree)
-		then
-			echo "Wonderful."
-			result_commit=$(
-				printf '%s\n' "$merge_msg" |
-				git commit-tree $result_tree -p HEAD -p "$1"
-			) || exit
-			finish "$result_commit" "In-index merge"
-			dropsave
-			exit 0
-		fi
-		echo "Nope."
-	esac
-	;;
-*)
-	# An octopus.  If we can reach all the remote we are up to date.
-	up_to_date=t
-	for remote
-	do
-		common_one=$(git merge-base --all $head $remote)
-		if test "$common_one" != "$remote"
-		then
-			up_to_date=f
-			break
-		fi
-	done
-	if test "$up_to_date" = t
-	then
-		finish_up_to_date "Already up to date. Yeeah!"
-		exit 0
-	fi
-	;;
-esac
-
-if test "$fast_forward_only" = t
-then
-	die "Not possible to fast-forward, aborting."
-fi
-
-# We are going to make a new commit.
-git var GIT_COMMITTER_IDENT >/dev/null || exit
-
-# At this point, we need a real merge.  No matter what strategy
-# we use, it would operate on the index, possibly affecting the
-# working tree, and when resolved cleanly, have the desired tree
-# in the index -- this means that the index must be in sync with
-# the $head commit.  The strategies are responsible to ensure this.
-
-case "$use_strategies" in
-?*' '?*)
-    # Stash away the local changes so that we can try more than one.
-    savestate
-    single_strategy=no
-    ;;
-*)
-    rm -f "$GIT_DIR/MERGE_STASH"
-    single_strategy=yes
-    ;;
-esac
-
-result_tree= best_cnt=-1 best_strategy= wt_strategy=
-merge_was_ok=
-for strategy in $use_strategies
-do
-    test "$wt_strategy" = '' || {
-	echo "Rewinding the tree to pristine..."
-	restorestate
-    }
-    case "$single_strategy" in
-    no)
-	echo "Trying merge strategy $strategy..."
-	;;
-    esac
-
-    # Remember which strategy left the state in the working tree
-    wt_strategy=$strategy
-
-    eval 'git-merge-$strategy '"$xopt"' $common -- "$head_arg" "$@"'
-    exit=$?
-    if test "$no_commit" = t && test "$exit" = 0
-    then
-        merge_was_ok=t
-	exit=1 ;# pretend it left conflicts.
-    fi
-
-    test "$exit" = 0 || {
-
-	# The backend exits with 1 when conflicts are left to be resolved,
-	# with 2 when it does not handle the given merge at all.
-
-	if test "$exit" -eq 1
-	then
-	    cnt=$({
-		git diff-files --name-only
-		git ls-files --unmerged
-	    } | wc -l)
-	    if test $best_cnt -le 0 || test $cnt -le $best_cnt
-	    then
-		best_strategy=$strategy
-		best_cnt=$cnt
-	    fi
-	fi
-	continue
-    }
-
-    # Automerge succeeded.
-    result_tree=$(git write-tree) && break
-done
-
-# If we have a resulting tree, that means the strategy module
-# auto resolved the merge cleanly.
-if test '' != "$result_tree"
-then
-    if test "$allow_fast_forward" = "t"
-    then
-	parents=$(git merge-base --independent "$head" "$@")
-    else
-	parents=$(git rev-parse "$head" "$@")
-    fi
-    parents=$(echo "$parents" | sed -e 's/^/-p /')
-    result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit
-    finish "$result_commit" "Merge made by $wt_strategy."
-    dropsave
-    exit 0
-fi
-
-# Pick the result from the best strategy and have the user fix it up.
-case "$best_strategy" in
-'')
-	restorestate
-	case "$use_strategies" in
-	?*' '?*)
-		echo >&2 "No merge strategy handled the merge."
-		;;
-	*)
-		echo >&2 "Merge with strategy $use_strategies failed."
-		;;
-	esac
-	exit 2
-	;;
-"$wt_strategy")
-	# We already have its result in the working tree.
-	;;
-*)
-	echo "Rewinding the tree to pristine..."
-	restorestate
-	echo "Using the $best_strategy to prepare resolving by hand."
-	git-merge-$best_strategy $common -- "$head_arg" "$@"
-	;;
-esac
-
-if test "$squash" = t
-then
-	finish
-else
-	for remote
-	do
-		echo $remote
-	done >"$GIT_DIR/MERGE_HEAD"
-	printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG" ||
-		die "Could not write to $GIT_DIR/MERGE_MSG"
-	if test "$allow_fast_forward" != t
-	then
-		printf "%s" no-ff
-	else
-		:
-	fi >"$GIT_DIR/MERGE_MODE" ||
-		die "Could not write to $GIT_DIR/MERGE_MODE"
-fi
-
-if test "$merge_was_ok" = t
-then
-	echo >&2 \
-	"Automatic merge went well; stopped before committing as requested"
-	exit 0
-else
-	{
-	    echo '
-Conflicts:
-'
-		git ls-files --unmerged |
-		sed -e 's/^[^	]*	/	/' |
-		uniq
-	} >>"$GIT_DIR/MERGE_MSG"
-	git rerere $rr_arg
-	die "Automatic merge failed; fix conflicts and then commit the result."
-fi
diff --git a/contrib/examples/git-notes.sh b/contrib/examples/git-notes.sh
deleted file mode 100755
index e642e47..0000000
--- a/contrib/examples/git-notes.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-USAGE="(edit [-F <file> | -m <msg>] | show) [commit]"
-. git-sh-setup
-
-test -z "$1" && usage
-ACTION="$1"; shift
-
-test -z "$GIT_NOTES_REF" && GIT_NOTES_REF="$(git config core.notesref)"
-test -z "$GIT_NOTES_REF" && GIT_NOTES_REF="refs/notes/commits"
-
-MESSAGE=
-while test $# != 0
-do
-	case "$1" in
-	-m)
-		test "$ACTION" = "edit" || usage
-		shift
-		if test "$#" = "0"; then
-			die "error: option -m needs an argument"
-		else
-			if [ -z "$MESSAGE" ]; then
-				MESSAGE="$1"
-			else
-				MESSAGE="$MESSAGE
-
-$1"
-			fi
-			shift
-		fi
-		;;
-	-F)
-		test "$ACTION" = "edit" || usage
-		shift
-		if test "$#" = "0"; then
-			die "error: option -F needs an argument"
-		else
-			if [ -z "$MESSAGE" ]; then
-				MESSAGE="$(cat "$1")"
-			else
-				MESSAGE="$MESSAGE
-
-$(cat "$1")"
-			fi
-			shift
-		fi
-		;;
-	-*)
-		usage
-		;;
-	*)
-		break
-		;;
-	esac
-done
-
-COMMIT=$(git rev-parse --verify --default HEAD "$@") ||
-die "Invalid commit: $@"
-
-case "$ACTION" in
-edit)
-	if [ "${GIT_NOTES_REF#refs/notes/}" = "$GIT_NOTES_REF" ]; then
-		die "Refusing to edit notes in $GIT_NOTES_REF (outside of refs/notes/)"
-	fi
-
-	MSG_FILE="$GIT_DIR/new-notes-$COMMIT"
-	GIT_INDEX_FILE="$MSG_FILE.idx"
-	export GIT_INDEX_FILE
-
-	trap '
-		test -f "$MSG_FILE" && rm "$MSG_FILE"
-		test -f "$GIT_INDEX_FILE" && rm "$GIT_INDEX_FILE"
-	' 0
-
-	CURRENT_HEAD=$(git show-ref "$GIT_NOTES_REF" | cut -f 1 -d ' ')
-	if [ -z "$CURRENT_HEAD" ]; then
-		PARENT=
-	else
-		PARENT="-p $CURRENT_HEAD"
-		git read-tree "$GIT_NOTES_REF" || die "Could not read index"
-	fi
-
-	if [ -z "$MESSAGE" ]; then
-		GIT_NOTES_REF= git log -1 $COMMIT | sed "s/^/#/" > "$MSG_FILE"
-		if [ ! -z "$CURRENT_HEAD" ]; then
-			git cat-file blob :$COMMIT >> "$MSG_FILE" 2> /dev/null
-		fi
-		core_editor="$(git config core.editor)"
-		${GIT_EDITOR:-${core_editor:-${VISUAL:-${EDITOR:-vi}}}} "$MSG_FILE"
-	else
-		echo "$MESSAGE" > "$MSG_FILE"
-	fi
-
-	grep -v ^# < "$MSG_FILE" | git stripspace > "$MSG_FILE".processed
-	mv "$MSG_FILE".processed "$MSG_FILE"
-	if [ -s "$MSG_FILE" ]; then
-		BLOB=$(git hash-object -w "$MSG_FILE") ||
-			die "Could not write into object database"
-		git update-index --add --cacheinfo 0644 $BLOB $COMMIT ||
-			die "Could not write index"
-	else
-		test -z "$CURRENT_HEAD" &&
-			die "Will not initialise with empty tree"
-		git update-index --force-remove $COMMIT ||
-			die "Could not update index"
-	fi
-
-	TREE=$(git write-tree) || die "Could not write tree"
-	NEW_HEAD=$(echo Annotate $COMMIT | git commit-tree $TREE $PARENT) ||
-		die "Could not annotate"
-	git update-ref -m "Annotate $COMMIT" \
-		"$GIT_NOTES_REF" $NEW_HEAD $CURRENT_HEAD
-;;
-show)
-	git rev-parse -q --verify "$GIT_NOTES_REF":$COMMIT > /dev/null ||
-		die "No note for commit $COMMIT."
-	git show "$GIT_NOTES_REF":$COMMIT
-;;
-*)
-	usage
-esac
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
deleted file mode 100755
index 6b3a03f..0000000
--- a/contrib/examples/git-pull.sh
+++ /dev/null
@@ -1,381 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Junio C Hamano
-#
-# Fetch one or more remote refs and merge it/them into the current HEAD.
-
-SUBDIRECTORY_OK=Yes
-OPTIONS_KEEPDASHDASH=
-OPTIONS_STUCKLONG=Yes
-OPTIONS_SPEC="\
-git pull [options] [<repository> [<refspec>...]]
-
-Fetch one or more remote refs and integrate it/them with the current HEAD.
---
-v,verbose                  be more verbose
-q,quiet                    be more quiet
-progress                   force progress reporting
-
-  Options related to merging
-r,rebase?false|true|preserve incorporate changes by rebasing rather than merging
-n!                         do not show a diffstat at the end of the merge
-stat                       show a diffstat at the end of the merge
-summary                    (synonym to --stat)
-log?n                      add (at most <n>) entries from shortlog to merge commit message
-squash                     create a single commit instead of doing a merge
-commit                     perform a commit if the merge succeeds (default)
-e,edit                       edit message before committing
-ff                         allow fast-forward
-ff-only!                   abort if fast-forward is not possible
-verify-signatures          verify that the named commit has a valid GPG signature
-s,strategy=strategy        merge strategy to use
-X,strategy-option=option   option for selected merge strategy
-S,gpg-sign?key-id          GPG sign commit
-
-  Options related to fetching
-all                        fetch from all remotes
-a,append                   append to .git/FETCH_HEAD instead of overwriting
-upload-pack=path           path to upload pack on remote end
-f,force                    force overwrite of local branch
-t,tags                     fetch all tags and associated objects
-p,prune                    prune remote-tracking branches no longer on remote
-recurse-submodules?on-demand control recursive fetching of submodules
-dry-run                    dry run
-k,keep                     keep downloaded pack
-depth=depth                deepen history of shallow clone
-unshallow                  convert to a complete repository
-update-shallow             accept refs that update .git/shallow
-refmap=refmap              specify fetch refmap
-"
-test $# -gt 0 && args="$*"
-. git-sh-setup
-. git-sh-i18n
-set_reflog_action "pull${args+ $args}"
-require_work_tree_exists
-cd_to_toplevel
-
-
-die_conflict () {
-    git diff-index --cached --name-status -r --ignore-submodules HEAD --
-    if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
-	die "$(gettext "Pull is not possible because you have unmerged files.
-Please, fix them up in the work tree, and then use 'git add/rm <file>'
-as appropriate to mark resolution and make a commit.")"
-    else
-	die "$(gettext "Pull is not possible because you have unmerged files.")"
-    fi
-}
-
-die_merge () {
-    if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
-	die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
-Please, commit your changes before merging.")"
-    else
-	die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
-    fi
-}
-
-test -z "$(git ls-files -u)" || die_conflict
-test -f "$GIT_DIR/MERGE_HEAD" && die_merge
-
-bool_or_string_config () {
-	git config --bool "$1" 2>/dev/null || git config "$1"
-}
-
-strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
-log_arg= verbosity= progress= recurse_submodules= verify_signatures=
-merge_args= edit= rebase_args= all= append= upload_pack= force= tags= prune=
-keep= depth= unshallow= update_shallow= refmap=
-curr_branch=$(git symbolic-ref -q HEAD)
-curr_branch_short="${curr_branch#refs/heads/}"
-rebase=$(bool_or_string_config branch.$curr_branch_short.rebase)
-if test -z "$rebase"
-then
-	rebase=$(bool_or_string_config pull.rebase)
-fi
-
-# Setup default fast-forward options via `pull.ff`
-pull_ff=$(bool_or_string_config pull.ff)
-case "$pull_ff" in
-true)
-	no_ff=--ff
-	;;
-false)
-	no_ff=--no-ff
-	;;
-only)
-	ff_only=--ff-only
-	;;
-esac
-
-
-dry_run=
-while :
-do
-	case "$1" in
-	-q|--quiet)
-		verbosity="$verbosity -q" ;;
-	-v|--verbose)
-		verbosity="$verbosity -v" ;;
-	--progress)
-		progress=--progress ;;
-	--no-progress)
-		progress=--no-progress ;;
-	-n|--no-stat|--no-summary)
-		diffstat=--no-stat ;;
-	--stat|--summary)
-		diffstat=--stat ;;
-	--log|--log=*|--no-log)
-		log_arg="$1" ;;
-	--no-commit)
-		no_commit=--no-commit ;;
-	--commit)
-		no_commit=--commit ;;
-	-e|--edit)
-		edit=--edit ;;
-	--no-edit)
-		edit=--no-edit ;;
-	--squash)
-		squash=--squash ;;
-	--no-squash)
-		squash=--no-squash ;;
-	--ff)
-		no_ff=--ff ;;
-	--no-ff)
-		no_ff=--no-ff ;;
-	--ff-only)
-		ff_only=--ff-only ;;
-	-s*|--strategy=*)
-		strategy_args="$strategy_args $1"
-		;;
-	-X*|--strategy-option=*)
-		merge_args="$merge_args $(git rev-parse --sq-quote "$1")"
-		;;
-	-r*|--rebase=*)
-		rebase="${1#*=}"
-		;;
-	--rebase)
-		rebase=true
-		;;
-	--no-rebase)
-		rebase=false
-		;;
-	--recurse-submodules)
-		recurse_submodules=--recurse-submodules
-		;;
-	--recurse-submodules=*)
-		recurse_submodules="$1"
-		;;
-	--no-recurse-submodules)
-		recurse_submodules=--no-recurse-submodules
-		;;
-	--verify-signatures)
-		verify_signatures=--verify-signatures
-		;;
-	--no-verify-signatures)
-		verify_signatures=--no-verify-signatures
-		;;
-	--gpg-sign|-S)
-		gpg_sign_args=-S
-		;;
-	--gpg-sign=*)
-		gpg_sign_args=$(git rev-parse --sq-quote "-S${1#--gpg-sign=}")
-		;;
-	-S*)
-		gpg_sign_args=$(git rev-parse --sq-quote "$1")
-		;;
-	--dry-run)
-		dry_run=--dry-run
-		;;
-	--all|--no-all)
-		all=$1 ;;
-	-a|--append|--no-append)
-		append=$1 ;;
-	--upload-pack=*|--no-upload-pack)
-		upload_pack=$1 ;;
-	-f|--force|--no-force)
-		force="$force $1" ;;
-	-t|--tags|--no-tags)
-		tags=$1 ;;
-	-p|--prune|--no-prune)
-		prune=$1 ;;
-	-k|--keep|--no-keep)
-		keep=$1 ;;
-	--depth=*|--no-depth)
-		depth=$1 ;;
-	--unshallow|--no-unshallow)
-		unshallow=$1 ;;
-	--update-shallow|--no-update-shallow)
-		update_shallow=$1 ;;
-	--refmap=*|--no-refmap)
-		refmap=$1 ;;
-	-h|--help-all)
-		usage
-		;;
-	--)
-		shift
-		break
-		;;
-	*)
-		usage
-		;;
-	esac
-	shift
-done
-
-case "$rebase" in
-preserve)
-	rebase=true
-	rebase_args=--preserve-merges
-	;;
-true|false|'')
-	;;
-*)
-	echo "Invalid value for --rebase, should be true, false, or preserve"
-	usage
-	exit 1
-	;;
-esac
-
-error_on_no_merge_candidates () {
-	exec >&2
-
-	if test true = "$rebase"
-	then
-		op_type=rebase
-		op_prep=against
-	else
-		op_type=merge
-		op_prep=with
-	fi
-
-	upstream=$(git config "branch.$curr_branch_short.merge")
-	remote=$(git config "branch.$curr_branch_short.remote")
-
-	if [ $# -gt 1 ]; then
-		if [ "$rebase" = true ]; then
-			printf "There is no candidate for rebasing against "
-		else
-			printf "There are no candidates for merging "
-		fi
-		echo "among the refs that you just fetched."
-		echo "Generally this means that you provided a wildcard refspec which had no"
-		echo "matches on the remote end."
-	elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
-		echo "You asked to pull from the remote '$1', but did not specify"
-		echo "a branch. Because this is not the default configured remote"
-		echo "for your current branch, you must specify a branch on the command line."
-	elif [ -z "$curr_branch" -o -z "$upstream" ]; then
-		. git-parse-remote
-		error_on_missing_default_upstream "pull" $op_type $op_prep \
-			"git pull <remote> <branch>"
-	else
-		echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
-		echo "from the remote, but no such ref was fetched."
-	fi
-	exit 1
-}
-
-test true = "$rebase" && {
-	if ! git rev-parse -q --verify HEAD >/dev/null
-	then
-		# On an unborn branch
-		if test -f "$(git rev-parse --git-path index)"
-		then
-			die "$(gettext "updating an unborn branch with changes added to the index")"
-		fi
-	else
-		require_clean_work_tree "pull with rebase" "Please commit or stash them."
-	fi
-	oldremoteref= &&
-	test -n "$curr_branch" &&
-	. git-parse-remote &&
-	remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
-	oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch 2>/dev/null)
-}
-orig_head=$(git rev-parse -q --verify HEAD)
-git fetch $verbosity $progress $dry_run $recurse_submodules $all $append \
-${upload_pack:+"$upload_pack"} $force $tags $prune $keep $depth $unshallow $update_shallow \
-$refmap --update-head-ok "$@" || exit 1
-test -z "$dry_run" || exit 0
-
-curr_head=$(git rev-parse -q --verify HEAD)
-if test -n "$orig_head" && test "$curr_head" != "$orig_head"
-then
-	# The fetch involved updating the current branch.
-
-	# The working tree and the index file is still based on the
-	# $orig_head commit, but we are merging into $curr_head.
-	# First update the working tree to match $curr_head.
-
-	eval_gettextln "Warning: fetch updated the current branch head.
-Warning: fast-forwarding your working tree from
-Warning: commit \$orig_head." >&2
-	git update-index -q --refresh
-	git read-tree -u -m "$orig_head" "$curr_head" ||
-		die "$(eval_gettext "Cannot fast-forward your working tree.
-After making sure that you saved anything precious from
-$ git diff \$orig_head
-output, run
-$ git reset --hard
-to recover.")"
-
-fi
-
-merge_head=$(sed -e '/	not-for-merge	/d' \
-	-e 's/	.*//' "$GIT_DIR"/FETCH_HEAD | \
-	tr '\012' ' ')
-
-case "$merge_head" in
-'')
-	error_on_no_merge_candidates "$@"
-	;;
-?*' '?*)
-	if test -z "$orig_head"
-	then
-		die "$(gettext "Cannot merge multiple branches into empty head")"
-	fi
-	if test true = "$rebase"
-	then
-		die "$(gettext "Cannot rebase onto multiple branches")"
-	fi
-	;;
-esac
-
-# Pulling into unborn branch: a shorthand for branching off
-# FETCH_HEAD, for lazy typers.
-if test -z "$orig_head"
-then
-	# Two-way merge: we claim the index is based on an empty tree,
-	# and try to fast-forward to HEAD.  This ensures we will not
-	# lose index/worktree changes that the user already made on
-	# the unborn branch.
-	empty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-	git read-tree -m -u $empty_tree $merge_head &&
-	git update-ref -m "initial pull" HEAD $merge_head "$curr_head"
-	exit
-fi
-
-if test true = "$rebase"
-then
-	o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)
-	if test "$oldremoteref" = "$o"
-	then
-		unset oldremoteref
-	fi
-fi
-
-case "$rebase" in
-true)
-	eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity"
-	eval="$eval $gpg_sign_args"
-	eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
-	;;
-*)
-	eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
-	eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
-	eval="$eval $gpg_sign_args"
-	eval="$eval FETCH_HEAD"
-	;;
-esac
-eval "exec $eval"
diff --git a/contrib/examples/git-remote.perl b/contrib/examples/git-remote.perl
deleted file mode 100755
index d42df7b..0000000
--- a/contrib/examples/git-remote.perl
+++ /dev/null
@@ -1,474 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use Git;
-my $git = Git->repository();
-
-sub add_remote_config {
-	my ($hash, $name, $what, $value) = @_;
-	if ($what eq 'url') {
-		# Having more than one is Ok -- it is used for push.
-		if (! exists $hash->{'URL'}) {
-			$hash->{$name}{'URL'} = $value;
-		}
-	}
-	elsif ($what eq 'fetch') {
-		$hash->{$name}{'FETCH'} ||= [];
-		push @{$hash->{$name}{'FETCH'}}, $value;
-	}
-	elsif ($what eq 'push') {
-		$hash->{$name}{'PUSH'} ||= [];
-		push @{$hash->{$name}{'PUSH'}}, $value;
-	}
-	if (!exists $hash->{$name}{'SOURCE'}) {
-		$hash->{$name}{'SOURCE'} = 'config';
-	}
-}
-
-sub add_remote_remotes {
-	my ($hash, $file, $name) = @_;
-
-	if (exists $hash->{$name}) {
-		$hash->{$name}{'WARNING'} = 'ignored due to config';
-		return;
-	}
-
-	my $fh;
-	if (!open($fh, '<', $file)) {
-		print STDERR "Warning: cannot open $file\n";
-		return;
-	}
-	my $it = { 'SOURCE' => 'remotes' };
-	$hash->{$name} = $it;
-	while (<$fh>) {
-		chomp;
-		if (/^URL:\s*(.*)$/) {
-			# Having more than one is Ok -- it is used for push.
-			if (! exists $it->{'URL'}) {
-				$it->{'URL'} = $1;
-			}
-		}
-		elsif (/^Push:\s*(.*)$/) {
-			$it->{'PUSH'} ||= [];
-			push @{$it->{'PUSH'}}, $1;
-		}
-		elsif (/^Pull:\s*(.*)$/) {
-			$it->{'FETCH'} ||= [];
-			push @{$it->{'FETCH'}}, $1;
-		}
-		elsif (/^\#/) {
-			; # ignore
-		}
-		else {
-			print STDERR "Warning: funny line in $file: $_\n";
-		}
-	}
-	close($fh);
-}
-
-sub list_remote {
-	my ($git) = @_;
-	my %seen = ();
-	my @remotes = eval {
-		$git->command(qw(config --get-regexp), '^remote\.');
-	};
-	for (@remotes) {
-		if (/^remote\.(\S+?)\.([^.\s]+)\s+(.*)$/) {
-			add_remote_config(\%seen, $1, $2, $3);
-		}
-	}
-
-	my $dir = $git->repo_path() . "/remotes";
-	if (opendir(my $dh, $dir)) {
-		local $_;
-		while ($_ = readdir($dh)) {
-			chomp;
-			next if (! -f "$dir/$_" || ! -r _);
-			add_remote_remotes(\%seen, "$dir/$_", $_);
-		}
-	}
-
-	return \%seen;
-}
-
-sub add_branch_config {
-	my ($hash, $name, $what, $value) = @_;
-	if ($what eq 'remote') {
-		if (exists $hash->{$name}{'REMOTE'}) {
-			print STDERR "Warning: more than one branch.$name.remote\n";
-		}
-		$hash->{$name}{'REMOTE'} = $value;
-	}
-	elsif ($what eq 'merge') {
-		$hash->{$name}{'MERGE'} ||= [];
-		push @{$hash->{$name}{'MERGE'}}, $value;
-	}
-}
-
-sub list_branch {
-	my ($git) = @_;
-	my %seen = ();
-	my @branches = eval {
-		$git->command(qw(config --get-regexp), '^branch\.');
-	};
-	for (@branches) {
-		if (/^branch\.([^.]*)\.(\S*)\s+(.*)$/) {
-			add_branch_config(\%seen, $1, $2, $3);
-		}
-	}
-
-	return \%seen;
-}
-
-my $remote = list_remote($git);
-my $branch = list_branch($git);
-
-sub update_ls_remote {
-	my ($harder, $info) = @_;
-
-	return if (($harder == 0) ||
-		   (($harder == 1) && exists $info->{'LS_REMOTE'}));
-
-	my @ref = map { s|refs/heads/||; $_; } keys %{$git->remote_refs($info->{'URL'}, [ 'heads' ])};
-	$info->{'LS_REMOTE'} = \@ref;
-}
-
-sub list_wildcard_mapping {
-	my ($forced, $ours, $ls) = @_;
-	my %refs;
-	for (@$ls) {
-		$refs{$_} = 01; # bit #0 to say "they have"
-	}
-	for ($git->command('for-each-ref', "refs/remotes/$ours")) {
-		chomp;
-		next unless (s|^[0-9a-f]{40}\s[a-z]+\srefs/remotes/$ours/||);
-		next if ($_ eq 'HEAD');
-		$refs{$_} ||= 0;
-		$refs{$_} |= 02; # bit #1 to say "we have"
-	}
-	my (@new, @stale, @tracked);
-	for (sort keys %refs) {
-		my $have = $refs{$_};
-		if ($have == 1) {
-			push @new, $_;
-		}
-		elsif ($have == 2) {
-			push @stale, $_;
-		}
-		elsif ($have == 3) {
-			push @tracked, $_;
-		}
-	}
-	return \@new, \@stale, \@tracked;
-}
-
-sub list_mapping {
-	my ($name, $info) = @_;
-	my $fetch = $info->{'FETCH'};
-	my $ls = $info->{'LS_REMOTE'};
-	my (@new, @stale, @tracked);
-
-	for (@$fetch) {
-		next unless (/(\+)?([^:]+):(.*)/);
-		my ($forced, $theirs, $ours) = ($1, $2, $3);
-		if ($theirs eq 'refs/heads/*' &&
-		    $ours =~ /^refs\/remotes\/(.*)\/\*$/) {
-			# wildcard mapping
-			my ($w_new, $w_stale, $w_tracked)
-				= list_wildcard_mapping($forced, $1, $ls);
-			push @new, @$w_new;
-			push @stale, @$w_stale;
-			push @tracked, @$w_tracked;
-		}
-		elsif ($theirs =~ /\*/ || $ours =~ /\*/) {
-			print STDERR "Warning: unrecognized mapping in remotes.$name.fetch: $_\n";
-		}
-		elsif ($theirs =~ s|^refs/heads/||) {
-			if (!grep { $_ eq $theirs } @$ls) {
-				push @stale, $theirs;
-			}
-			elsif ($ours ne '') {
-				push @tracked, $theirs;
-			}
-		}
-	}
-	return \@new, \@stale, \@tracked;
-}
-
-sub show_mapping {
-	my ($name, $info) = @_;
-	my ($new, $stale, $tracked) = list_mapping($name, $info);
-	if (@$new) {
-		print "  New remote branches (next fetch will store in remotes/$name)\n";
-		print "    @$new\n";
-	}
-	if (@$stale) {
-		print "  Stale tracking branches in remotes/$name (use 'git remote prune')\n";
-		print "    @$stale\n";
-	}
-	if (@$tracked) {
-		print "  Tracked remote branches\n";
-		print "    @$tracked\n";
-	}
-}
-
-sub prune_remote {
-	my ($name, $ls_remote) = @_;
-	if (!exists $remote->{$name}) {
-		print STDERR "No such remote $name\n";
-		return 1;
-	}
-	my $info = $remote->{$name};
-	update_ls_remote($ls_remote, $info);
-
-	my ($new, $stale, $tracked) = list_mapping($name, $info);
-	my $prefix = "refs/remotes/$name";
-	foreach my $to_prune (@$stale) {
-		my @v = $git->command(qw(rev-parse --verify), "$prefix/$to_prune");
-		$git->command(qw(update-ref -d), "$prefix/$to_prune", $v[0]);
-	}
-	return 0;
-}
-
-sub show_remote {
-	my ($name, $ls_remote) = @_;
-	if (!exists $remote->{$name}) {
-		print STDERR "No such remote $name\n";
-		return 1;
-	}
-	my $info = $remote->{$name};
-	update_ls_remote($ls_remote, $info);
-
-	print "* remote $name\n";
-	print "  URL: $info->{'URL'}\n";
-	for my $branchname (sort keys %$branch) {
-		next unless (defined $branch->{$branchname}{'REMOTE'} &&
-			     $branch->{$branchname}{'REMOTE'} eq $name);
-		my @merged = map {
-			s|^refs/heads/||;
-			$_;
-		} split(' ',"@{$branch->{$branchname}{'MERGE'}}");
-		next unless (@merged);
-		print "  Remote branch(es) merged with 'git pull' while on branch $branchname\n";
-		print "    @merged\n";
-	}
-	if ($info->{'LS_REMOTE'}) {
-		show_mapping($name, $info);
-	}
-	if ($info->{'PUSH'}) {
-		my @pushed = map {
-			s|^refs/heads/||;
-			s|^\+refs/heads/|+|;
-			s|:refs/heads/|:|;
-			$_;
-		} @{$info->{'PUSH'}};
-		print "  Local branch(es) pushed with 'git push'\n";
-		print "    @pushed\n";
-	}
-	return 0;
-}
-
-sub add_remote {
-	my ($name, $url, $opts) = @_;
-	if (exists $remote->{$name}) {
-		print STDERR "remote $name already exists.\n";
-		exit(1);
-	}
-	$git->command('config', "remote.$name.url", $url);
-	my $track = $opts->{'track'} || ["*"];
-
-	for (@$track) {
-		$git->command('config', '--add', "remote.$name.fetch",
-				$opts->{'mirror'} ?
-				"+refs/$_:refs/$_" :
-				"+refs/heads/$_:refs/remotes/$name/$_");
-	}
-	if ($opts->{'fetch'}) {
-		$git->command('fetch', $name);
-	}
-	if (exists $opts->{'master'}) {
-		$git->command('symbolic-ref', "refs/remotes/$name/HEAD",
-			      "refs/remotes/$name/$opts->{'master'}");
-	}
-}
-
-sub update_remote {
-	my ($name) = @_;
-	my @remotes;
-
-        my $conf = $git->config("remotes." . $name);
-	if (defined($conf)) {
-		@remotes = split(' ', $conf);
-	} elsif ($name eq 'default') {
-		@remotes = ();
-		for (sort keys %$remote) {
-			my $do_fetch = $git->config_bool("remote." . $_ .
-						    ".skipDefaultUpdate");
-			unless ($do_fetch) {
-				push @remotes, $_;
-			}
-		}
-	} else {
-		print STDERR "Remote group $name does not exist.\n";
-		exit(1);
-	}
-	for (@remotes) {
-		print "Updating $_\n";
-		$git->command('fetch', "$_");
-	}
-}
-
-sub rm_remote {
-	my ($name) = @_;
-	if (!exists $remote->{$name}) {
-		print STDERR "No such remote $name\n";
-		return 1;
-	}
-
-	$git->command('config', '--remove-section', "remote.$name");
-
-	eval {
-	    my @trackers = $git->command('config', '--get-regexp',
-			'branch.*.remote', $name);
-		for (@trackers) {
-			/^branch\.(.*)?\.remote/;
-			$git->config('--unset', "branch.$1.remote");
-			$git->config('--unset', "branch.$1.merge");
-		}
-	};
-
-	my @refs = $git->command('for-each-ref',
-		'--format=%(refname) %(objectname)', "refs/remotes/$name");
-	for (@refs) {
-		my ($ref, $object) = split;
-		$git->command(qw(update-ref -d), $ref, $object);
-	}
-	return 0;
-}
-
-sub add_usage {
-	print STDERR "usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n";
-	exit(1);
-}
-
-my $VERBOSE = 0;
-@ARGV = grep {
-	if ($_ eq '-v' or $_ eq '--verbose') {
-		$VERBOSE=1;
-		0
-	} else {
-		1
-	}
-} @ARGV;
-
-if (!@ARGV) {
-	for (sort keys %$remote) {
-		print "$_";
-		print "\t$remote->{$_}->{URL}" if $VERBOSE;
-		print "\n";
-	}
-}
-elsif ($ARGV[0] eq 'show') {
-	my $ls_remote = 1;
-	my $i;
-	for ($i = 1; $i < @ARGV; $i++) {
-		if ($ARGV[$i] eq '-n') {
-			$ls_remote = 0;
-		}
-		else {
-			last;
-		}
-	}
-	if ($i >= @ARGV) {
-		print STDERR "usage: git remote show <remote>\n";
-		exit(1);
-	}
-	my $status = 0;
-	for (; $i < @ARGV; $i++) {
-		$status |= show_remote($ARGV[$i], $ls_remote);
-	}
-	exit($status);
-}
-elsif ($ARGV[0] eq 'update') {
-	if (@ARGV <= 1) {
-		update_remote("default");
-		exit(1);
-	}
-	for (my $i = 1; $i < @ARGV; $i++) {
-		update_remote($ARGV[$i]);
-	}
-}
-elsif ($ARGV[0] eq 'prune') {
-	my $ls_remote = 1;
-	my $i;
-	for ($i = 1; $i < @ARGV; $i++) {
-		if ($ARGV[$i] eq '-n') {
-			$ls_remote = 0;
-		}
-		else {
-			last;
-		}
-	}
-	if ($i >= @ARGV) {
-		print STDERR "usage: git remote prune <remote>\n";
-		exit(1);
-	}
-	my $status = 0;
-	for (; $i < @ARGV; $i++) {
-		$status |= prune_remote($ARGV[$i], $ls_remote);
-	}
-        exit($status);
-}
-elsif ($ARGV[0] eq 'add') {
-	my %opts = ();
-	while (1 < @ARGV && $ARGV[1] =~ /^-/) {
-		my $opt = $ARGV[1];
-		shift @ARGV;
-		if ($opt eq '-f' || $opt eq '--fetch') {
-			$opts{'fetch'} = 1;
-			next;
-		}
-		if ($opt eq '-t' || $opt eq '--track') {
-			if (@ARGV < 1) {
-				add_usage();
-			}
-			$opts{'track'} ||= [];
-			push @{$opts{'track'}}, $ARGV[1];
-			shift @ARGV;
-			next;
-		}
-		if ($opt eq '-m' || $opt eq '--master') {
-			if ((@ARGV < 1) || exists $opts{'master'}) {
-				add_usage();
-			}
-			$opts{'master'} = $ARGV[1];
-			shift @ARGV;
-			next;
-		}
-		if ($opt eq '--mirror') {
-			$opts{'mirror'} = 1;
-			next;
-		}
-		add_usage();
-	}
-	if (@ARGV != 3) {
-		add_usage();
-	}
-	add_remote($ARGV[1], $ARGV[2], \%opts);
-}
-elsif ($ARGV[0] eq 'rm') {
-	if (@ARGV <= 1) {
-		print STDERR "usage: git remote rm <remote>\n";
-		exit(1);
-	}
-	exit(rm_remote($ARGV[1]));
-}
-else {
-	print STDERR "usage: git remote\n";
-	print STDERR "       git remote add <name> <url>\n";
-	print STDERR "       git remote rm <name>\n";
-	print STDERR "       git remote show <name>\n";
-	print STDERR "       git remote prune <name>\n";
-	print STDERR "       git remote update [group]\n";
-	exit(1);
-}
diff --git a/contrib/examples/git-repack.sh b/contrib/examples/git-repack.sh
deleted file mode 100755
index 672af93..0000000
--- a/contrib/examples/git-repack.sh
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-#
-
-OPTIONS_KEEPDASHDASH=
-OPTIONS_SPEC="\
-git repack [options]
---
-a               pack everything in a single pack
-A               same as -a, and turn unreachable objects loose
-d               remove redundant packs, and run git-prune-packed
-f               pass --no-reuse-delta to git-pack-objects
-F               pass --no-reuse-object to git-pack-objects
-n               do not run git-update-server-info
-q,quiet         be quiet
-l               pass --local to git-pack-objects
-unpack-unreachable=  with -A, do not loosen objects older than this
- Packing constraints
-window=         size of the window used for delta compression
-window-memory=  same as the above, but limit memory size instead of entries count
-depth=          limits the maximum delta depth
-max-pack-size=  maximum size of each packfile
-"
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-no_update_info= all_into_one= remove_redundant= unpack_unreachable=
-local= no_reuse= extra=
-while test $# != 0
-do
-	case "$1" in
-	-n)	no_update_info=t ;;
-	-a)	all_into_one=t ;;
-	-A)	all_into_one=t
-		unpack_unreachable=--unpack-unreachable ;;
-	--unpack-unreachable)
-		unpack_unreachable="--unpack-unreachable=$2"; shift ;;
-	-d)	remove_redundant=t ;;
-	-q)	GIT_QUIET=t ;;
-	-f)	no_reuse=--no-reuse-delta ;;
-	-F)	no_reuse=--no-reuse-object ;;
-	-l)	local=--local ;;
-	--max-pack-size|--window|--window-memory|--depth)
-		extra="$extra $1=$2"; shift ;;
-	--) shift; break;;
-	*)	usage ;;
-	esac
-	shift
-done
-
-case "$(git config --bool repack.usedeltabaseoffset || echo true)" in
-true)
-	extra="$extra --delta-base-offset" ;;
-esac
-
-PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
-PACKTMP="$PACKDIR/.tmp-$$-pack"
-rm -f "$PACKTMP"-*
-trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
-
-# There will be more repacking strategies to come...
-case ",$all_into_one," in
-,,)
-	args='--unpacked --incremental'
-	;;
-,t,)
-	args= existing=
-	if [ -d "$PACKDIR" ]; then
-		for e in $(cd "$PACKDIR" && find . -type f -name '*.pack' \
-			| sed -e 's/^\.\///' -e 's/\.pack$//')
-		do
-			if [ -e "$PACKDIR/$e.keep" ]; then
-				: keep
-			else
-				existing="$existing $e"
-			fi
-		done
-		if test -n "$existing" && test -n "$unpack_unreachable" && \
-			test -n "$remove_redundant"
-		then
-			# This may have arbitrary user arguments, so we
-			# have to protect it against whitespace splitting
-			# when it gets run as "pack-objects $args" later.
-			# Fortunately, we know it's an approxidate, so we
-			# can just use dots instead.
-			args="$args $(echo "$unpack_unreachable" | tr ' ' .)"
-		fi
-	fi
-	;;
-esac
-
-mkdir -p "$PACKDIR" || exit
-
-args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra"
-names=$(git pack-objects --keep-true-parents --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
-	exit 1
-if [ -z "$names" ]; then
-	say Nothing new to pack.
-fi
-
-# Ok we have prepared all new packfiles.
-
-# First see if there are packs of the same name and if so
-# if we can move them out of the way (this can happen if we
-# repacked immediately after packing fully.
-rollback=
-failed=
-for name in $names
-do
-	for sfx in pack idx
-	do
-		file=pack-$name.$sfx
-		test -f "$PACKDIR/$file" || continue
-		rm -f "$PACKDIR/old-$file" &&
-		mv "$PACKDIR/$file" "$PACKDIR/old-$file" || {
-			failed=t
-			break
-		}
-		rollback="$rollback $file"
-	done
-	test -z "$failed" || break
-done
-
-# If renaming failed for any of them, roll the ones we have
-# already renamed back to their original names.
-if test -n "$failed"
-then
-	rollback_failure=
-	for file in $rollback
-	do
-		mv "$PACKDIR/old-$file" "$PACKDIR/$file" ||
-		rollback_failure="$rollback_failure $file"
-	done
-	if test -n "$rollback_failure"
-	then
-		echo >&2 "WARNING: Some packs in use have been renamed by"
-		echo >&2 "WARNING: prefixing old- to their name, in order to"
-		echo >&2 "WARNING: replace them with the new version of the"
-		echo >&2 "WARNING: file.  But the operation failed, and"
-		echo >&2 "WARNING: attempt to rename them back to their"
-		echo >&2 "WARNING: original names also failed."
-		echo >&2 "WARNING: Please rename them in $PACKDIR manually:"
-		for file in $rollback_failure
-		do
-			echo >&2 "WARNING:   old-$file -> $file"
-		done
-	fi
-	exit 1
-fi
-
-# Now the ones with the same name are out of the way...
-fullbases=
-for name in $names
-do
-	fullbases="$fullbases pack-$name"
-	chmod a-w "$PACKTMP-$name.pack"
-	chmod a-w "$PACKTMP-$name.idx"
-	mv -f "$PACKTMP-$name.pack" "$PACKDIR/pack-$name.pack" &&
-	mv -f "$PACKTMP-$name.idx"  "$PACKDIR/pack-$name.idx" ||
-	exit
-done
-
-# Remove the "old-" files
-for name in $names
-do
-	rm -f "$PACKDIR/old-pack-$name.idx"
-	rm -f "$PACKDIR/old-pack-$name.pack"
-done
-
-# End of pack replacement.
-
-if test "$remove_redundant" = t
-then
-	# We know $existing are all redundant.
-	if [ -n "$existing" ]
-	then
-		( cd "$PACKDIR" &&
-		  for e in $existing
-		  do
-			case " $fullbases " in
-			*" $e "*) ;;
-			*)	rm -f "$e.pack" "$e.idx" "$e.keep" ;;
-			esac
-		  done
-		)
-	fi
-	git prune-packed ${GIT_QUIET:+-q}
-fi
-
-case "$no_update_info" in
-t) : ;;
-*) git update-server-info ;;
-esac
diff --git a/contrib/examples/git-rerere.perl b/contrib/examples/git-rerere.perl
deleted file mode 100755
index 4f69209..0000000
--- a/contrib/examples/git-rerere.perl
+++ /dev/null
@@ -1,284 +0,0 @@
-#!/usr/bin/perl
-#
-# REuse REcorded REsolve.  This tool records a conflicted automerge
-# result and its hand resolution, and helps to resolve future
-# automerge that results in the same conflict.
-#
-# To enable this feature, create a directory 'rr-cache' under your
-# .git/ directory.
-
-use Digest;
-use File::Path;
-use File::Copy;
-
-my $git_dir = $::ENV{GIT_DIR} || ".git";
-my $rr_dir = "$git_dir/rr-cache";
-my $merge_rr = "$git_dir/rr-cache/MERGE_RR";
-
-my %merge_rr = ();
-
-sub read_rr {
-	if (!-f $merge_rr) {
-		%merge_rr = ();
-		return;
-	}
-	my $in;
-	local $/ = "\0";
-	open $in, "<$merge_rr" or die "$!: $merge_rr";
-	while (<$in>) {
-		chomp;
-		my ($name, $path) = /^([0-9a-f]{40})\t(.*)$/s;
-		$merge_rr{$path} = $name;
-	}
-	close $in;
-}
-
-sub write_rr {
-	my $out;
-	open $out, ">$merge_rr" or die "$!: $merge_rr";
-	for my $path (sort keys %merge_rr) {
-		my $name = $merge_rr{$path};
-		print $out "$name\t$path\0";
-	}
-	close $out;
-}
-
-sub compute_conflict_name {
-	my ($path) = @_;
-	my @side = ();
-	my $in;
-	open $in, "<$path"  or die "$!: $path";
-
-	my $sha1 = Digest->new("SHA-1");
-	my $hunk = 0;
-	while (<$in>) {
-		if (/^<<<<<<< .*/) {
-			$hunk++;
-			@side = ([], undef);
-		}
-		elsif (/^=======$/) {
-			$side[1] = [];
-		}
-		elsif (/^>>>>>>> .*/) {
-			my ($one, $two);
-			$one = join('', @{$side[0]});
-			$two = join('', @{$side[1]});
-			if ($two le $one) {
-				($one, $two) = ($two, $one);
-			}
-			$sha1->add($one);
-			$sha1->add("\0");
-			$sha1->add($two);
-			$sha1->add("\0");
-			@side = ();
-		}
-		elsif (@side == 0) {
-			next;
-		}
-		elsif (defined $side[1]) {
-			push @{$side[1]}, $_;
-		}
-		else {
-			push @{$side[0]}, $_;
-		}
-	}
-	close $in;
-	return ($sha1->hexdigest, $hunk);
-}
-
-sub record_preimage {
-	my ($path, $name) = @_;
-	my @side = ();
-	my ($in, $out);
-	open $in, "<$path"  or die "$!: $path";
-	open $out, ">$name" or die "$!: $name";
-
-	while (<$in>) {
-		if (/^<<<<<<< .*/) {
-			@side = ([], undef);
-		}
-		elsif (/^=======$/) {
-			$side[1] = [];
-		}
-		elsif (/^>>>>>>> .*/) {
-			my ($one, $two);
-			$one = join('', @{$side[0]});
-			$two = join('', @{$side[1]});
-			if ($two le $one) {
-				($one, $two) = ($two, $one);
-			}
-			print $out "<<<<<<<\n";
-			print $out $one;
-			print $out "=======\n";
-			print $out $two;
-			print $out ">>>>>>>\n";
-			@side = ();
-		}
-		elsif (@side == 0) {
-			print $out $_;
-		}
-		elsif (defined $side[1]) {
-			push @{$side[1]}, $_;
-		}
-		else {
-			push @{$side[0]}, $_;
-		}
-	}
-	close $out;
-	close $in;
-}
-
-sub find_conflict {
-	my $in;
-	local $/ = "\0";
-	my $pid = open($in, '-|');
-	die "$!" unless defined $pid;
-	if (!$pid) {
-		exec(qw(git ls-files -z -u)) or die "$!: ls-files";
-	}
-	my %path = ();
-	my @path = ();
-	while (<$in>) {
-		chomp;
-		my ($mode, $sha1, $stage, $path) =
-		    /^([0-7]+) ([0-9a-f]{40}) ([123])\t(.*)$/s;
-		$path{$path} |= (1 << $stage);
-	}
-	close $in;
-	while (my ($path, $status) = each %path) {
-		if ($status == 14) { push @path, $path; }
-	}
-	return @path;
-}
-
-sub merge {
-	my ($name, $path) = @_;
-	record_preimage($path, "$rr_dir/$name/thisimage");
-	unless (system('git', 'merge-file', map { "$rr_dir/$name/${_}image" }
-		       qw(this pre post))) {
-		my $in;
-		open $in, "<$rr_dir/$name/thisimage" or
-		    die "$!: $name/thisimage";
-		my $out;
-		open $out, ">$path" or die "$!: $path";
-		while (<$in>) { print $out $_; }
-		close $in;
-		close $out;
-		return 1;
-	}
-	return 0;
-}
-
-sub garbage_collect_rerere {
-	# We should allow specifying these from the command line and
-	# that is why the caller gives @ARGV to us, but I am lazy.
-
-	my $cutoff_noresolve = 15; # two weeks
-	my $cutoff_resolve = 60; # two months
-	my @to_remove;
-	while (<$rr_dir/*/preimage>) {
-		my ($dir) = /^(.*)\/preimage$/;
-		my $cutoff = ((-f "$dir/postimage")
-			      ? $cutoff_resolve
-			      : $cutoff_noresolve);
-		my $age = -M "$_";
-		if ($cutoff <= $age) {
-			push @to_remove, $dir;
-		}
-	}
-	if (@to_remove) {
-		rmtree(\@to_remove);
-	}
-}
-
--d "$rr_dir" || exit(0);
-
-read_rr();
-
-if (@ARGV) {
-	my $arg = shift @ARGV;
-	if ($arg eq 'clear') {
-		for my $path (keys %merge_rr) {
-			my $name = $merge_rr{$path};
-			if (-d "$rr_dir/$name" &&
-			    ! -f "$rr_dir/$name/postimage") {
-				rmtree(["$rr_dir/$name"]);
-			}
-		}
-		unlink $merge_rr;
-	}
-	elsif ($arg eq 'status') {
-		for my $path (keys %merge_rr) {
-			print $path, "\n";
-		}
-	}
-	elsif ($arg eq 'diff') {
-		for my $path (keys %merge_rr) {
-			my $name = $merge_rr{$path};
-			system('diff', ((@ARGV == 0) ? ('-u') : @ARGV),
-				'-L', "a/$path", '-L', "b/$path",
-				"$rr_dir/$name/preimage", $path);
-		}
-	}
-	elsif ($arg eq 'gc') {
-		garbage_collect_rerere(@ARGV);
-	}
-	else {
-		die "$0 unknown command: $arg\n";
-	}
-	exit 0;
-}
-
-my %conflict = map { $_ => 1 } find_conflict();
-
-# MERGE_RR records paths with conflicts immediately after merge
-# failed.  Some of the conflicted paths might have been hand resolved
-# in the working tree since then, but the initial run would catch all
-# and register their preimages.
-
-for my $path (keys %conflict) {
-	# This path has conflict.  If it is not recorded yet,
-	# record the pre-image.
-	if (!exists $merge_rr{$path}) {
-		my ($name, $hunk) = compute_conflict_name($path);
-		next unless ($hunk);
-		$merge_rr{$path} = $name;
-		if (! -d "$rr_dir/$name") {
-			mkpath("$rr_dir/$name", 0, 0777);
-			print STDERR "Recorded preimage for '$path'\n";
-			record_preimage($path, "$rr_dir/$name/preimage");
-		}
-	}
-}
-
-# Now some of the paths that had conflicts earlier might have been
-# hand resolved.  Others may be similar to a conflict already that
-# was resolved before.
-
-for my $path (keys %merge_rr) {
-	my $name = $merge_rr{$path};
-
-	# We could resolve this automatically if we have images.
-	if (-f "$rr_dir/$name/preimage" &&
-	    -f "$rr_dir/$name/postimage") {
-		if (merge($name, $path)) {
-			print STDERR "Resolved '$path' using previous resolution.\n";
-			# Then we do not have to worry about this path
-			# anymore.
-			delete $merge_rr{$path};
-			next;
-		}
-	}
-
-	# Let's see if we have resolved it.
-	(undef, my $hunk) = compute_conflict_name($path);
-	next if ($hunk);
-
-	print STDERR "Recorded resolution for '$path'.\n";
-	copy($path, "$rr_dir/$name/postimage");
-	# And we do not have to worry about this path anymore.
-	delete $merge_rr{$path};
-}
-
-# Write out the rest.
-write_rr();
diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh
deleted file mode 100755
index cb1bbf3..0000000
--- a/contrib/examples/git-reset.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
-#
-USAGE='[--mixed | --soft | --hard]  [<commit-ish>] [ [--] <paths>...]'
-SUBDIRECTORY_OK=Yes
-. git-sh-setup
-set_reflog_action "reset $*"
-require_work_tree
-
-update= reset_type=--mixed
-unset rev
-
-while test $# != 0
-do
-	case "$1" in
-	--mixed | --soft | --hard)
-		reset_type="$1"
-		;;
-	--)
-		break
-		;;
-	-*)
-		usage
-		;;
-	*)
-		rev=$(git rev-parse --verify "$1") || exit
-		shift
-		break
-		;;
-	esac
-	shift
-done
-
-: ${rev=HEAD}
-rev=$(git rev-parse --verify $rev^0) || exit
-
-# Skip -- in "git reset HEAD -- foo" and "git reset -- foo".
-case "$1" in --) shift ;; esac
-
-# git reset --mixed tree [--] paths... can be used to
-# load chosen paths from the tree into the index without
-# affecting the working tree or HEAD.
-if test $# != 0
-then
-	test "$reset_type" = "--mixed" ||
-		die "Cannot do partial $reset_type reset."
-
-	git diff-index --cached $rev -- "$@" |
-	sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]	\(.*\)$/\1 \2	\3/' |
-	git update-index --add --remove --index-info || exit
-	git update-index --refresh
-	exit
-fi
-
-cd_to_toplevel
-
-if test "$reset_type" = "--hard"
-then
-	update=-u
-fi
-
-# Soft reset does not touch the index file or the working tree
-# at all, but requires them in a good order.  Other resets reset
-# the index file to the tree object we are switching to.
-if test "$reset_type" = "--soft"
-then
-	if test -f "$GIT_DIR/MERGE_HEAD" ||
-	   test "" != "$(git ls-files --unmerged)"
-	then
-		die "Cannot do a soft reset in the middle of a merge."
-	fi
-else
-	git read-tree -v --reset $update "$rev" || exit
-fi
-
-# Any resets update HEAD to the head being switched to.
-if orig=$(git rev-parse --verify HEAD 2>/dev/null)
-then
-	echo "$orig" >"$GIT_DIR/ORIG_HEAD"
-else
-	rm -f "$GIT_DIR/ORIG_HEAD"
-fi
-git update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
-update_ref_status=$?
-
-case "$reset_type" in
---hard )
-	test $update_ref_status = 0 && {
-		printf "HEAD is now at "
-		GIT_PAGER= git log --max-count=1 --pretty=oneline \
-			--abbrev-commit HEAD
-	}
-	;;
---soft )
-	;; # Nothing else to do
---mixed )
-	# Report what has not been updated.
-	git update-index --refresh
-	;;
-esac
-
-rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \
-	"$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG"
-
-exit $update_ref_status
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
deleted file mode 100755
index 3099dc8..0000000
--- a/contrib/examples/git-resolve.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-#
-# Resolve two trees.
-#
-
-echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2
-echo 'WARNING: Please use git-merge or git-pull instead.' >&2
-sleep 2
-
-USAGE='<head> <remote> <merge-message>'
-. git-sh-setup
-
-dropheads() {
-	rm -f -- "$GIT_DIR/MERGE_HEAD" \
-		"$GIT_DIR/LAST_MERGE" || exit 1
-}
-
-head=$(git rev-parse --verify "$1"^0) &&
-merge=$(git rev-parse --verify "$2"^0) &&
-merge_name="$2" &&
-merge_msg="$3" || usage
-
-#
-# The remote name is just used for the message,
-# but we do want it.
-#
-if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
-	usage
-fi
-
-dropheads
-echo $head > "$GIT_DIR"/ORIG_HEAD
-echo $merge > "$GIT_DIR"/LAST_MERGE
-
-common=$(git merge-base $head $merge)
-if [ -z "$common" ]; then
-	die "Unable to find common commit between" $merge $head
-fi
-
-case "$common" in
-"$merge")
-	echo "Already up to date. Yeeah!"
-	dropheads
-	exit 0
-	;;
-"$head")
-	echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $merge)"
-	git read-tree -u -m $head $merge || exit 1
-	git update-ref -m "resolve $merge_name: Fast-forward" \
-		HEAD "$merge" "$head"
-	git diff-tree -p $head $merge | git apply --stat
-	dropheads
-	exit 0
-	;;
-esac
-
-# We are going to make a new commit.
-git var GIT_COMMITTER_IDENT >/dev/null || exit
-
-# Find an optimum merge base if there are more than one candidates.
-LF='
-'
-common=$(git merge-base -a $head $merge)
-case "$common" in
-?*"$LF"?*)
-	echo "Trying to find the optimum merge base."
-	G=.tmp-index$$
-	best=
-	best_cnt=-1
-	for c in $common
-	do
-		rm -f $G
-		GIT_INDEX_FILE=$G git read-tree -m $c $head $merge \
-			2>/dev/null || continue
-		# Count the paths that are unmerged.
-		cnt=$(GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l)
-		if test $best_cnt -le 0 || test $cnt -le $best_cnt
-		then
-			best=$c
-			best_cnt=$cnt
-			if test "$best_cnt" -eq 0
-			then
-				# Cannot do any better than all trivial merge.
-				break
-			fi
-		fi
-	done
-	rm -f $G
-	common="$best"
-esac
-
-echo "Trying to merge $merge into $head using $common."
-git update-index --refresh 2>/dev/null
-git read-tree -u -m $common $head $merge || exit 1
-result_tree=$(git write-tree  2> /dev/null)
-if [ $? -ne 0 ]; then
-	echo "Simple merge failed, trying Automatic merge"
-	git-merge-index -o git-merge-one-file -a
-	if [ $? -ne 0 ]; then
-		echo $merge > "$GIT_DIR"/MERGE_HEAD
-		die "Automatic merge failed, fix up by hand"
-	fi
-	result_tree=$(git write-tree) || exit 1
-fi
-result_commit=$(echo "$merge_msg" | git commit-tree $result_tree -p $head -p $merge)
-echo "Committed merge $result_commit"
-git update-ref -m "resolve $merge_name: In-index merge" \
-	HEAD "$result_commit" "$head"
-git diff-tree -p $head $result_commit | git apply --stat
-dropheads
diff --git a/contrib/examples/git-revert.sh b/contrib/examples/git-revert.sh
deleted file mode 100755
index 197838d..0000000
--- a/contrib/examples/git-revert.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-# Copyright (c) 2005 Junio C Hamano
-#
-
-case "$0" in
-*-revert* )
-	test -t 0 && edit=-e
-	replay=
-	me=revert
-	USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
-*-cherry-pick* )
-	replay=t
-	edit=
-	me=cherry-pick
-	USAGE='[--edit] [-n] [-r] [-x] <commit-ish>'  ;;
-* )
-	echo >&2 "What are you talking about?"
-	exit 1 ;;
-esac
-
-SUBDIRECTORY_OK=Yes ;# we will cd up
-. git-sh-setup
-require_work_tree
-cd_to_toplevel
-
-no_commit=
-xopt=
-while case "$#" in 0) break ;; esac
-do
-	case "$1" in
-	-n|--n|--no|--no-|--no-c|--no-co|--no-com|--no-comm|\
-	    --no-commi|--no-commit)
-		no_commit=t
-		;;
-	-e|--e|--ed|--edi|--edit)
-		edit=-e
-		;;
-	--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
-		edit=
-		;;
-	-r)
-		: no-op ;;
-	-x|--i-really-want-to-expose-my-private-commit-object-name)
-		replay=
-		;;
-	-X?*)
-		xopt="$xopt$(git rev-parse --sq-quote "--${1#-X}")"
-		;;
-	--strategy-option=*)
-		xopt="$xopt$(git rev-parse --sq-quote "--${1#--strategy-option=}")"
-		;;
-	-X|--strategy-option)
-		shift
-		xopt="$xopt$(git rev-parse --sq-quote "--$1")"
-		;;
-	-*)
-		usage
-		;;
-	*)
-		break
-		;;
-	esac
-	shift
-done
-
-set_reflog_action "$me"
-
-test "$me,$replay" = "revert,t" && usage
-
-case "$no_commit" in
-t)
-	# We do not intend to commit immediately.  We just want to
-	# merge the differences in.
-	head=$(git-write-tree) ||
-		die "Your index file is unmerged."
-	;;
-*)
-	head=$(git-rev-parse --verify HEAD) ||
-		die "You do not have a valid HEAD"
-	files=$(git-diff-index --cached --name-only $head) || exit
-	if [ "$files" ]; then
-		die "Dirty index: cannot $me (dirty: $files)"
-	fi
-	;;
-esac
-
-rev=$(git-rev-parse --verify "$@") &&
-commit=$(git-rev-parse --verify "$rev^0") ||
-	die "Not a single commit $@"
-prev=$(git-rev-parse --verify "$commit^1" 2>/dev/null) ||
-	die "Cannot run $me a root commit"
-git-rev-parse --verify "$commit^2" >/dev/null 2>&1 &&
-	die "Cannot run $me a multi-parent commit."
-
-encoding=$(git config i18n.commitencoding || echo UTF-8)
-
-# "commit" is an existing commit.  We would want to apply
-# the difference it introduces since its first parent "prev"
-# on top of the current HEAD if we are cherry-pick.  Or the
-# reverse of it if we are revert.
-
-case "$me" in
-revert)
-	git show -s --pretty=oneline --encoding="$encoding" $commit |
-	sed -e '
-		s/^[^ ]* /Revert "/
-		s/$/"/
-	'
-	echo
-	echo "This reverts commit $commit."
-	test "$rev" = "$commit" ||
-	echo "(original 'git revert' arguments: $@)"
-	base=$commit next=$prev
-	;;
-
-cherry-pick)
-	pick_author_script='
-	/^author /{
-		s/'\''/'\''\\'\'\''/g
-		h
-		s/^author \([^<]*\) <[^>]*> .*$/\1/
-		s/'\''/'\''\'\'\''/g
-		s/.*/GIT_AUTHOR_NAME='\''&'\''/p
-
-		g
-		s/^author [^<]* <\([^>]*\)> .*$/\1/
-		s/'\''/'\''\'\'\''/g
-		s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
-
-		g
-		s/^author [^<]* <[^>]*> \(.*\)$/\1/
-		s/'\''/'\''\'\'\''/g
-		s/.*/GIT_AUTHOR_DATE='\''&'\''/p
-
-		q
-	}'
-
-	logmsg=$(git show -s --pretty=raw --encoding="$encoding" "$commit")
-	set_author_env=$(echo "$logmsg" |
-	LANG=C LC_ALL=C sed -ne "$pick_author_script")
-	eval "$set_author_env"
-	export GIT_AUTHOR_NAME
-	export GIT_AUTHOR_EMAIL
-	export GIT_AUTHOR_DATE
-
-	echo "$logmsg" |
-	sed -e '1,/^$/d' -e 's/^    //'
-	case "$replay" in
-	'')
-		echo "(cherry picked from commit $commit)"
-		test "$rev" = "$commit" ||
-		echo "(original 'git cherry-pick' arguments: $@)"
-		;;
-	esac
-	base=$prev next=$commit
-	;;
-
-esac >.msg
-
-eval GITHEAD_$head=HEAD
-eval GITHEAD_$next='$(git show -s \
-	--pretty=oneline --encoding="$encoding" "$commit" |
-	sed -e "s/^[^ ]* //")'
-export GITHEAD_$head GITHEAD_$next
-
-# This three way merge is an interesting one.  We are at
-# $head, and would want to apply the change between $commit
-# and $prev on top of us (when reverting), or the change between
-# $prev and $commit on top of us (when cherry-picking or replaying).
-
-eval "git merge-recursive $xopt $base -- $head $next" &&
-result=$(git-write-tree 2>/dev/null) || {
-	mv -f .msg "$GIT_DIR/MERGE_MSG"
-	{
-	    echo '
-Conflicts:
-'
-		git ls-files --unmerged |
-		sed -e 's/^[^	]*	/	/' |
-		uniq
-	} >>"$GIT_DIR/MERGE_MSG"
-	echo >&2 "Automatic $me failed.  After resolving the conflicts,"
-	echo >&2 "mark the corrected paths with 'git-add <paths>'"
-	echo >&2 "and commit the result."
-	case "$me" in
-	cherry-pick)
-		echo >&2 "You may choose to use the following when making"
-		echo >&2 "the commit:"
-		echo >&2 "$set_author_env"
-	esac
-	exit 1
-}
-
-# If we are cherry-pick, and if the merge did not result in
-# hand-editing, we will hit this commit and inherit the original
-# author date and name.
-# If we are revert, or if our cherry-pick results in a hand merge,
-# we had better say that the current user is responsible for that.
-
-case "$no_commit" in
-'')
-	git-commit -n -F .msg $edit
-	rm -f .msg
-	;;
-esac
diff --git a/contrib/examples/git-svnimport.perl b/contrib/examples/git-svnimport.perl
deleted file mode 100755
index c414f0d..0000000
--- a/contrib/examples/git-svnimport.perl
+++ /dev/null
@@ -1,976 +0,0 @@
-#!/usr/bin/perl
-
-# This tool is copyright (c) 2005, Matthias Urlichs.
-# It is released under the Gnu Public License, version 2.
-#
-# The basic idea is to pull and analyze SVN changes.
-#
-# Checking out the files is done by a single long-running SVN connection.
-#
-# The head revision is on branch "origin" by default.
-# You can change that with the '-o' option.
-
-use strict;
-use warnings;
-use Getopt::Std;
-use File::Copy;
-use File::Spec;
-use File::Temp qw(tempfile);
-use File::Path qw(mkpath);
-use File::Basename qw(basename dirname);
-use Time::Local;
-use IO::Pipe;
-use POSIX qw(strftime dup2);
-use IPC::Open2;
-use SVN::Core;
-use SVN::Ra;
-
-die "Need SVN:Core 1.2.1 or better" if $SVN::Core::VERSION lt "1.2.1";
-
-$SIG{'PIPE'}="IGNORE";
-$ENV{'TZ'}="UTC";
-
-our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,
-    $opt_b,$opt_r,$opt_I,$opt_A,$opt_s,$opt_l,$opt_d,$opt_D,$opt_S,$opt_F,
-    $opt_P,$opt_R);
-
-sub usage() {
-	print STDERR <<END;
-usage: ${\basename $0}     # fetch/update GIT from SVN
-       [-o branch-for-HEAD] [-h] [-v] [-l max_rev] [-R repack_each_revs]
-       [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
-       [-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg]
-       [-m] [-M regex] [-A author_file] [-S] [-F] [-P project_name] [SVN_URL]
-END
-	exit(1);
-}
-
-getopts("A:b:C:dDFhiI:l:mM:o:rs:t:T:SP:R:uv") or usage();
-usage if $opt_h;
-
-my $tag_name = $opt_t || "tags";
-my $trunk_name = defined $opt_T ? $opt_T : "trunk";
-my $branch_name = $opt_b || "branches";
-my $project_name = $opt_P || "";
-$project_name = "/" . $project_name if ($project_name);
-my $repack_after = $opt_R || 1000;
-my $root_pool = SVN::Pool->new_default;
-
-@ARGV == 1 or @ARGV == 2 or usage();
-
-$opt_o ||= "origin";
-$opt_s ||= 1;
-my $git_tree = $opt_C;
-$git_tree ||= ".";
-
-my $svn_url = $ARGV[0];
-my $svn_dir = $ARGV[1];
-
-our @mergerx = ();
-if ($opt_m) {
-	my $branch_esc = quotemeta ($branch_name);
-	my $trunk_esc  = quotemeta ($trunk_name);
-	@mergerx =
-	(
-		qr!\b(?:merg(?:ed?|ing))\b.*?\b((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
-		qr!\b(?:from|of)\W+((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
-		qr!\b(?:from|of)\W+(?:the )?([\w\.\-]+)[-\s]branch\b!i
-	);
-}
-if ($opt_M) {
-	unshift (@mergerx, qr/$opt_M/);
-}
-
-# Absolutize filename now, since we will have chdir'ed by the time we
-# get around to opening it.
-$opt_A = File::Spec->rel2abs($opt_A) if $opt_A;
-
-our %users = ();
-our $users_file = undef;
-sub read_users($) {
-	$users_file = File::Spec->rel2abs(@_);
-	die "Cannot open $users_file\n" unless -f $users_file;
-	open(my $authors,$users_file);
-	while(<$authors>) {
-		chomp;
-		next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
-		(my $user,my $name,my $email) = ($1,$2,$3);
-		$users{$user} = [$name,$email];
-	}
-	close($authors);
-}
-
-select(STDERR); $|=1; select(STDOUT);
-
-
-package SVNconn;
-# Basic SVN connection.
-# We're only interested in connecting and downloading, so ...
-
-use File::Spec;
-use File::Temp qw(tempfile);
-use POSIX qw(strftime dup2);
-use Fcntl qw(SEEK_SET);
-
-sub new {
-	my($what,$repo) = @_;
-	$what=ref($what) if ref($what);
-
-	my $self = {};
-	$self->{'buffer'} = "";
-	bless($self,$what);
-
-	$repo =~ s#/+$##;
-	$self->{'fullrep'} = $repo;
-	$self->conn();
-
-	return $self;
-}
-
-sub conn {
-	my $self = shift;
-	my $repo = $self->{'fullrep'};
-	my $auth = SVN::Core::auth_open ([SVN::Client::get_simple_provider,
-			  SVN::Client::get_ssl_server_trust_file_provider,
-			  SVN::Client::get_username_provider]);
-	my $s = SVN::Ra->new(url => $repo, auth => $auth, pool => $root_pool);
-	die "SVN connection to $repo: $!\n" unless defined $s;
-	$self->{'svn'} = $s;
-	$self->{'repo'} = $repo;
-	$self->{'maxrev'} = $s->get_latest_revnum();
-}
-
-sub file {
-	my($self,$path,$rev) = @_;
-
-	my ($fh, $name) = tempfile('gitsvn.XXXXXX',
-		    DIR => File::Spec->tmpdir(), UNLINK => 1);
-
-	print "... $rev $path ...\n" if $opt_v;
-	my (undef, $properties);
-	$path =~ s#^/*##;
-	my $subpool = SVN::Pool::new_default_sub;
-	eval { (undef, $properties)
-		   = $self->{'svn'}->get_file($path,$rev,$fh); };
-	if($@) {
-		return undef if $@ =~ /Attempted to get checksum/;
-		die $@;
-	}
-	my $mode;
-	if (exists $properties->{'svn:executable'}) {
-		$mode = '100755';
-	} elsif (exists $properties->{'svn:special'}) {
-		my ($special_content, $filesize);
-		$filesize = tell $fh;
-		seek $fh, 0, SEEK_SET;
-		read $fh, $special_content, $filesize;
-		if ($special_content =~ s/^link //) {
-			$mode = '120000';
-			seek $fh, 0, SEEK_SET;
-			truncate $fh, 0;
-			print $fh $special_content;
-		} else {
-			die "unexpected svn:special file encountered";
-		}
-	} else {
-		$mode = '100644';
-	}
-	close ($fh);
-
-	return ($name, $mode);
-}
-
-sub ignore {
-	my($self,$path,$rev) = @_;
-
-	print "... $rev $path ...\n" if $opt_v;
-	$path =~ s#^/*##;
-	my $subpool = SVN::Pool::new_default_sub;
-	my (undef,undef,$properties)
-	    = $self->{'svn'}->get_dir($path,$rev,undef);
-	if (exists $properties->{'svn:ignore'}) {
-		my ($fh, $name) = tempfile('gitsvn.XXXXXX',
-					   DIR => File::Spec->tmpdir(),
-					   UNLINK => 1);
-		print $fh $properties->{'svn:ignore'};
-		close($fh);
-		return $name;
-	} else {
-		return undef;
-	}
-}
-
-sub dir_list {
-	my($self,$path,$rev) = @_;
-	$path =~ s#^/*##;
-	my $subpool = SVN::Pool::new_default_sub;
-	my ($dirents,undef,$properties)
-	    = $self->{'svn'}->get_dir($path,$rev,undef);
-	return $dirents;
-}
-
-package main;
-use URI;
-
-our $svn = $svn_url;
-$svn .= "/$svn_dir" if defined $svn_dir;
-my $svn2 = SVNconn->new($svn);
-$svn = SVNconn->new($svn);
-
-my $lwp_ua;
-if($opt_d or $opt_D) {
-	$svn_url = URI->new($svn_url)->canonical;
-	if($opt_D) {
-		$svn_dir =~ s#/*$#/#;
-	} else {
-		$svn_dir = "";
-	}
-	if ($svn_url->scheme eq "http") {
-		use LWP::UserAgent;
-		$lwp_ua = LWP::UserAgent->new(keep_alive => 1, requests_redirectable => []);
-	} else {
-		print STDERR "Warning: not HTTP; turning off direct file access\n";
-		$opt_d=0;
-	}
-}
-
-sub pdate($) {
-	my($d) = @_;
-	$d =~ m#(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)#
-		or die "Unparseable date: $d\n";
-	my $y=$1; $y-=1900 if $y>1900;
-	return timegm($6||0,$5,$4,$3,$2-1,$y);
-}
-
-sub getwd() {
-	my $pwd = `pwd`;
-	chomp $pwd;
-	return $pwd;
-}
-
-
-sub get_headref($$) {
-    my $name    = shift;
-    my $git_dir = shift;
-    my $sha;
-
-    if (open(C,"$git_dir/refs/heads/$name")) {
-	chomp($sha = <C>);
-	close(C);
-	length($sha) == 40
-	    or die "Cannot get head id for $name ($sha): $!\n";
-    }
-    return $sha;
-}
-
-
--d $git_tree
-	or mkdir($git_tree,0777)
-	or die "Could not create $git_tree: $!";
-chdir($git_tree);
-
-my $orig_branch = "";
-my $forward_master = 0;
-my %branches;
-
-my $git_dir = $ENV{"GIT_DIR"} || ".git";
-$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
-$ENV{"GIT_DIR"} = $git_dir;
-my $orig_git_index;
-$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
-my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx',
-				    DIR => File::Spec->tmpdir());
-close ($git_ih);
-$ENV{GIT_INDEX_FILE} = $git_index;
-my $maxnum = 0;
-my $last_rev = "";
-my $last_branch;
-my $current_rev = $opt_s || 1;
-unless(-d $git_dir) {
-	system("git init");
-	die "Cannot init the GIT db at $git_tree: $?\n" if $?;
-	system("git read-tree --empty");
-	die "Cannot init an empty tree: $?\n" if $?;
-
-	$last_branch = $opt_o;
-	$orig_branch = "";
-} else {
-	-f "$git_dir/refs/heads/$opt_o"
-		or die "Branch '$opt_o' does not exist.\n".
-		       "Either use the correct '-o branch' option,\n".
-		       "or import to a new repository.\n";
-
-	-f "$git_dir/svn2git"
-		or die "'$git_dir/svn2git' does not exist.\n".
-		       "You need that file for incremental imports.\n";
-	open(F, "git symbolic-ref HEAD |") or
-		die "Cannot run git-symbolic-ref: $!\n";
-	chomp ($last_branch = <F>);
-	$last_branch = basename($last_branch);
-	close(F);
-	unless($last_branch) {
-		warn "Cannot read the last branch name: $! -- assuming 'master'\n";
-		$last_branch = "master";
-	}
-	$orig_branch = $last_branch;
-	$last_rev = get_headref($orig_branch, $git_dir);
-	if (-f "$git_dir/SVN2GIT_HEAD") {
-		die <<EOM;
-SVN2GIT_HEAD exists.
-Make sure your working directory corresponds to HEAD and remove SVN2GIT_HEAD.
-You may need to run
-
-    git-read-tree -m -u SVN2GIT_HEAD HEAD
-EOM
-	}
-	system('cp', "$git_dir/HEAD", "$git_dir/SVN2GIT_HEAD");
-
-	$forward_master =
-	    $opt_o ne 'master' && -f "$git_dir/refs/heads/master" &&
-	    system('cmp', '-s', "$git_dir/refs/heads/master",
-				"$git_dir/refs/heads/$opt_o") == 0;
-
-	# populate index
-	system('git', 'read-tree', $last_rev);
-	die "read-tree failed: $?\n" if $?;
-
-	# Get the last import timestamps
-	open my $B,"<", "$git_dir/svn2git";
-	while(<$B>) {
-		chomp;
-		my($num,$branch,$ref) = split;
-		$branches{$branch}{$num} = $ref;
-		$branches{$branch}{"LAST"} = $ref;
-		$current_rev = $num+1 if $current_rev <= $num;
-	}
-	close($B);
-}
--d $git_dir
-	or die "Could not create git subdir ($git_dir).\n";
-
-my $default_authors = "$git_dir/svn-authors";
-if ($opt_A) {
-	read_users($opt_A);
-	copy($opt_A,$default_authors) or die "Copy failed: $!";
-} else {
-	read_users($default_authors) if -f $default_authors;
-}
-
-open BRANCHES,">>", "$git_dir/svn2git";
-
-sub node_kind($$) {
-	my ($svnpath, $revision) = @_;
-	$svnpath =~ s#^/*##;
-	my $subpool = SVN::Pool::new_default_sub;
-	my $kind = $svn->{'svn'}->check_path($svnpath,$revision);
-	return $kind;
-}
-
-sub get_file($$$) {
-	my($svnpath,$rev,$path) = @_;
-
-	# now get it
-	my ($name,$mode);
-	if($opt_d) {
-		my($req,$res);
-
-		# /svn/!svn/bc/2/django/trunk/django-docs/build.py
-		my $url=$svn_url->clone();
-		$url->path($url->path."/!svn/bc/$rev/$svn_dir$svnpath");
-		print "... $path...\n" if $opt_v;
-		$req = HTTP::Request->new(GET => $url);
-		$res = $lwp_ua->request($req);
-		if ($res->is_success) {
-			my $fh;
-			($fh, $name) = tempfile('gitsvn.XXXXXX',
-			DIR => File::Spec->tmpdir(), UNLINK => 1);
-			print $fh $res->content;
-			close($fh) or die "Could not write $name: $!\n";
-		} else {
-			return undef if $res->code == 301; # directory?
-			die $res->status_line." at $url\n";
-		}
-		$mode = '0644'; # can't obtain mode via direct http request?
-	} else {
-		($name,$mode) = $svn->file("$svnpath",$rev);
-		return undef unless defined $name;
-	}
-
-	my $pid = open(my $F, '-|');
-	die $! unless defined $pid;
-	if (!$pid) {
-	    exec("git", "hash-object", "-w", $name)
-		or die "Cannot create object: $!\n";
-	}
-	my $sha = <$F>;
-	chomp $sha;
-	close $F;
-	unlink $name;
-	return [$mode, $sha, $path];
-}
-
-sub get_ignore($$$$$) {
-	my($new,$old,$rev,$path,$svnpath) = @_;
-
-	return unless $opt_I;
-	my $name = $svn->ignore("$svnpath",$rev);
-	if ($path eq '/') {
-		$path = $opt_I;
-	} else {
-		$path = File::Spec->catfile($path,$opt_I);
-	}
-	if (defined $name) {
-		my $pid = open(my $F, '-|');
-		die $! unless defined $pid;
-		if (!$pid) {
-			exec("git", "hash-object", "-w", $name)
-			    or die "Cannot create object: $!\n";
-		}
-		my $sha = <$F>;
-		chomp $sha;
-		close $F;
-		unlink $name;
-		push(@$new,['0644',$sha,$path]);
-	} elsif (defined $old) {
-		push(@$old,$path);
-	}
-}
-
-sub project_path($$)
-{
-	my ($path, $project) = @_;
-
-	$path = "/".$path unless ($path =~ m#^\/#) ;
-	return $1 if ($path =~ m#^$project\/(.*)$#);
-
-	$path =~ s#\.#\\\.#g;
-	$path =~ s#\+#\\\+#g;
-	return "/" if ($project =~ m#^$path.*$#);
-
-	return undef;
-}
-
-sub split_path($$) {
-	my($rev,$path) = @_;
-	my $branch;
-
-	if($path =~ s#^/\Q$tag_name\E/([^/]+)/?##) {
-		$branch = "/$1";
-	} elsif($path =~ s#^/\Q$trunk_name\E/?##) {
-		$branch = "/";
-	} elsif($path =~ s#^/\Q$branch_name\E/([^/]+)/?##) {
-		$branch = $1;
-	} else {
-		my %no_error = (
-			"/" => 1,
-			"/$tag_name" => 1,
-			"/$branch_name" => 1
-		);
-		print STDERR "$rev: Unrecognized path: $path\n" unless (defined $no_error{$path});
-		return ()
-	}
-	if ($path eq "") {
-		$path = "/";
-	} elsif ($project_name) {
-		$path = project_path($path, $project_name);
-	}
-	return ($branch,$path);
-}
-
-sub branch_rev($$) {
-
-	my ($srcbranch,$uptorev) = @_;
-
-	my $bbranches = $branches{$srcbranch};
-	my @revs = reverse sort { ($a eq 'LAST' ? 0 : $a) <=> ($b eq 'LAST' ? 0 : $b) } keys %$bbranches;
-	my $therev;
-	foreach my $arev(@revs) {
-		next if  ($arev eq 'LAST');
-		if ($arev <= $uptorev) {
-			$therev = $arev;
-			last;
-		}
-	}
-	return $therev;
-}
-
-sub expand_svndir($$$);
-
-sub expand_svndir($$$)
-{
-	my ($svnpath, $rev, $path) = @_;
-	my @list;
-	get_ignore(\@list, undef, $rev, $path, $svnpath);
-	my $dirents = $svn->dir_list($svnpath, $rev);
-	foreach my $p(keys %$dirents) {
-		my $kind = node_kind($svnpath.'/'.$p, $rev);
-		if ($kind eq $SVN::Node::file) {
-			my $f = get_file($svnpath.'/'.$p, $rev, $path.'/'.$p);
-			push(@list, $f) if $f;
-		} elsif ($kind eq $SVN::Node::dir) {
-			push(@list,
-			     expand_svndir($svnpath.'/'.$p, $rev, $path.'/'.$p));
-		}
-	}
-	return @list;
-}
-
-sub copy_path($$$$$$$$) {
-	# Somebody copied a whole subdirectory.
-	# We need to find the index entries from the old version which the
-	# SVN log entry points to, and add them to the new place.
-
-	my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
-
-	my($srcbranch,$srcpath) = split_path($rev,$oldpath);
-	unless(defined $srcbranch && defined $srcpath) {
-		print "Path not found when copying from $oldpath @ $rev.\n".
-			"Will try to copy from original SVN location...\n"
-			if $opt_v;
-		push (@$new, expand_svndir($oldpath, $rev, $path));
-		return;
-	}
-	my $therev = branch_rev($srcbranch, $rev);
-	my $gitrev = $branches{$srcbranch}{$therev};
-	unless($gitrev) {
-		print STDERR "$newrev:$newbranch: could not find $oldpath \@ $rev\n";
-		return;
-	}
-	if ($srcbranch ne $newbranch) {
-		push(@$parents, $branches{$srcbranch}{'LAST'});
-	}
-	print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v;
-	if ($node_kind eq $SVN::Node::dir) {
-		$srcpath =~ s#/*$#/#;
-	}
-
-	my $pid = open my $f,'-|';
-	die $! unless defined $pid;
-	if (!$pid) {
-		exec("git","ls-tree","-r","-z",$gitrev,$srcpath)
-			or die $!;
-	}
-	local $/ = "\0";
-	while(<$f>) {
-		chomp;
-		my($m,$p) = split(/\t/,$_,2);
-		my($mode,$type,$sha1) = split(/ /,$m);
-		next if $type ne "blob";
-		if ($node_kind eq $SVN::Node::dir) {
-			$p = $path . substr($p,length($srcpath)-1);
-		} else {
-			$p = $path;
-		}
-		push(@$new,[$mode,$sha1,$p]);
-	}
-	close($f) or
-		print STDERR "$newrev:$newbranch: could not list files in $oldpath \@ $rev\n";
-}
-
-sub commit {
-	my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
-	my($committer_name,$committer_email,$dest);
-	my($author_name,$author_email);
-	my(@old,@new,@parents);
-
-	if (not defined $author or $author eq "") {
-		$committer_name = $committer_email = "unknown";
-	} elsif (defined $users_file) {
-		die "User $author is not listed in $users_file\n"
-		    unless exists $users{$author};
-		($committer_name,$committer_email) = @{$users{$author}};
-	} elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
-		($committer_name, $committer_email) = ($1, $2);
-	} else {
-		$author =~ s/^<(.*)>$/$1/;
-		$committer_name = $committer_email = $author;
-	}
-
-	if ($opt_F && $message =~ /From:\s+(.*?)\s+<(.*)>\s*\n/) {
-		($author_name, $author_email) = ($1, $2);
-		print "Author from From: $1 <$2>\n" if ($opt_v);;
-	} elsif ($opt_S && $message =~ /Signed-off-by:\s+(.*?)\s+<(.*)>\s*\n/) {
-		($author_name, $author_email) = ($1, $2);
-		print "Author from Signed-off-by: $1 <$2>\n" if ($opt_v);;
-	} else {
-		$author_name = $committer_name;
-		$author_email = $committer_email;
-	}
-
-	$date = pdate($date);
-
-	my $tag;
-	my $parent;
-	if($branch eq "/") { # trunk
-		$parent = $opt_o;
-	} elsif($branch =~ m#^/(.+)#) { # tag
-		$tag = 1;
-		$parent = $1;
-	} else { # "normal" branch
-		# nothing to do
-		$parent = $branch;
-	}
-	$dest = $parent;
-
-	my $prev = $changed_paths->{"/"};
-	if($prev and $prev->[0] eq "A") {
-		delete $changed_paths->{"/"};
-		my $oldpath = $prev->[1];
-		my $rev;
-		if(defined $oldpath) {
-			my $p;
-			($parent,$p) = split_path($revision,$oldpath);
-			if(defined $parent) {
-				if($parent eq "/") {
-					$parent = $opt_o;
-				} else {
-					$parent =~ s#^/##; # if it's a tag
-				}
-			}
-		} else {
-			$parent = undef;
-		}
-	}
-
-	my $rev;
-	if($revision > $opt_s and defined $parent) {
-		open(H,'-|',"git","rev-parse","--verify",$parent);
-		$rev = <H>;
-		close(H) or do {
-			print STDERR "$revision: cannot find commit '$parent'!\n";
-			return;
-		};
-		chop $rev;
-		if(length($rev) != 40) {
-			print STDERR "$revision: cannot find commit '$parent'!\n";
-			return;
-		}
-		$rev = $branches{($parent eq $opt_o) ? "/" : $parent}{"LAST"};
-		if($revision != $opt_s and not $rev) {
-			print STDERR "$revision: do not know ancestor for '$parent'!\n";
-			return;
-		}
-	} else {
-		$rev = undef;
-	}
-
-#	if($prev and $prev->[0] eq "A") {
-#		if(not $tag) {
-#			unless(open(H,"> $git_dir/refs/heads/$branch")) {
-#				print STDERR "$revision: Could not create branch $branch: $!\n";
-#				$state=11;
-#				next;
-#			}
-#			print H "$rev\n"
-#				or die "Could not write branch $branch: $!";
-#			close(H)
-#				or die "Could not write branch $branch: $!";
-#		}
-#	}
-	if(not defined $rev) {
-		unlink($git_index);
-	} elsif ($rev ne $last_rev) {
-		print "Switching from $last_rev to $rev ($branch)\n" if $opt_v;
-		system("git", "read-tree", $rev);
-		die "read-tree failed for $rev: $?\n" if $?;
-		$last_rev = $rev;
-	}
-
-	push (@parents, $rev) if defined $rev;
-
-	my $cid;
-	if($tag and not %$changed_paths) {
-		$cid = $rev;
-	} else {
-		my @paths = sort keys %$changed_paths;
-		foreach my $path(@paths) {
-			my $action = $changed_paths->{$path};
-
-			if ($action->[0] eq "R") {
-				# refer to a file/tree in an earlier commit
-				push(@old,$path); # remove any old stuff
-			}
-			if(($action->[0] eq "A") || ($action->[0] eq "R")) {
-				my $node_kind = node_kind($action->[3], $revision);
-				if ($node_kind eq $SVN::Node::file) {
-					my $f = get_file($action->[3],
-							 $revision, $path);
-					if ($f) {
-						push(@new,$f) if $f;
-					} else {
-						my $opath = $action->[3];
-						print STDERR "$revision: $branch: could not fetch '$opath'\n";
-					}
-				} elsif ($node_kind eq $SVN::Node::dir) {
-					if($action->[1]) {
-						copy_path($revision, $branch,
-							  $path, $action->[1],
-							  $action->[2], $node_kind,
-							  \@new, \@parents);
-					} else {
-						get_ignore(\@new, \@old, $revision,
-							   $path, $action->[3]);
-					}
-				}
-			} elsif ($action->[0] eq "D") {
-				push(@old,$path);
-			} elsif ($action->[0] eq "M") {
-				my $node_kind = node_kind($action->[3], $revision);
-				if ($node_kind eq $SVN::Node::file) {
-					my $f = get_file($action->[3],
-							 $revision, $path);
-					push(@new,$f) if $f;
-				} elsif ($node_kind eq $SVN::Node::dir) {
-					get_ignore(\@new, \@old, $revision,
-						   $path, $action->[3]);
-				}
-			} else {
-				die "$revision: unknown action '".$action->[0]."' for $path\n";
-			}
-		}
-
-		while(@old) {
-			my @o1;
-			if(@old > 55) {
-				@o1 = splice(@old,0,50);
-			} else {
-				@o1 = @old;
-				@old = ();
-			}
-			my $pid = open my $F, "-|";
-			die "$!" unless defined $pid;
-			if (!$pid) {
-				exec("git", "ls-files", "-z", @o1) or die $!;
-			}
-			@o1 = ();
-			local $/ = "\0";
-			while(<$F>) {
-				chomp;
-				push(@o1,$_);
-			}
-			close($F);
-
-			while(@o1) {
-				my @o2;
-				if(@o1 > 55) {
-					@o2 = splice(@o1,0,50);
-				} else {
-					@o2 = @o1;
-					@o1 = ();
-				}
-				system("git","update-index","--force-remove","--",@o2);
-				die "Cannot remove files: $?\n" if $?;
-			}
-		}
-		while(@new) {
-			my @n2;
-			if(@new > 12) {
-				@n2 = splice(@new,0,10);
-			} else {
-				@n2 = @new;
-				@new = ();
-			}
-			system("git","update-index","--add",
-				(map { ('--cacheinfo', @$_) } @n2));
-			die "Cannot add files: $?\n" if $?;
-		}
-
-		my $pid = open(C,"-|");
-		die "Cannot fork: $!" unless defined $pid;
-		unless($pid) {
-			exec("git","write-tree");
-			die "Cannot exec git-write-tree: $!\n";
-		}
-		chomp(my $tree = <C>);
-		length($tree) == 40
-			or die "Cannot get tree id ($tree): $!\n";
-		close(C)
-			or die "Error running git-write-tree: $?\n";
-		print "Tree ID $tree\n" if $opt_v;
-
-		my $pr = IO::Pipe->new() or die "Cannot open pipe: $!\n";
-		my $pw = IO::Pipe->new() or die "Cannot open pipe: $!\n";
-		$pid = fork();
-		die "Fork: $!\n" unless defined $pid;
-		unless($pid) {
-			$pr->writer();
-			$pw->reader();
-			open(OUT,">&STDOUT");
-			dup2($pw->fileno(),0);
-			dup2($pr->fileno(),1);
-			$pr->close();
-			$pw->close();
-
-			my @par = ();
-
-			# loose detection of merges
-			# based on the commit msg
-			foreach my $rx (@mergerx) {
-				if ($message =~ $rx) {
-					my $mparent = $1;
-					if ($mparent eq 'HEAD') { $mparent = $opt_o };
-					if ( -e "$git_dir/refs/heads/$mparent") {
-						$mparent = get_headref($mparent, $git_dir);
-						push (@parents, $mparent);
-						print OUT "Merge parent branch: $mparent\n" if $opt_v;
-					}
-				}
-			}
-			my %seen_parents = ();
-			my @unique_parents = grep { ! $seen_parents{$_} ++ } @parents;
-			foreach my $bparent (@unique_parents) {
-				push @par, '-p', $bparent;
-				print OUT "Merge parent branch: $bparent\n" if $opt_v;
-			}
-
-			exec("env",
-				"GIT_AUTHOR_NAME=$author_name",
-				"GIT_AUTHOR_EMAIL=$author_email",
-				"GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
-				"GIT_COMMITTER_NAME=$committer_name",
-				"GIT_COMMITTER_EMAIL=$committer_email",
-				"GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
-				"git", "commit-tree", $tree,@par);
-			die "Cannot exec git-commit-tree: $!\n";
-		}
-		$pw->writer();
-		$pr->reader();
-
-		$message =~ s/[\s\n]+\z//;
-		$message = "r$revision: $message" if $opt_r;
-
-		print $pw "$message\n"
-			or die "Error writing to git-commit-tree: $!\n";
-		$pw->close();
-
-		print "Committed change $revision:$branch ".strftime("%Y-%m-%d %H:%M:%S",gmtime($date)).")\n" if $opt_v;
-		chomp($cid = <$pr>);
-		length($cid) == 40
-			or die "Cannot get commit id ($cid): $!\n";
-		print "Commit ID $cid\n" if $opt_v;
-		$pr->close();
-
-		waitpid($pid,0);
-		die "Error running git-commit-tree: $?\n" if $?;
-	}
-
-	if (not defined $cid) {
-		$cid = $branches{"/"}{"LAST"};
-	}
-
-	if(not defined $dest) {
-		print "... no known parent\n" if $opt_v;
-	} elsif(not $tag) {
-		print "Writing to refs/heads/$dest\n" if $opt_v;
-		open(C,">$git_dir/refs/heads/$dest") and
-		print C ("$cid\n") and
-		close(C)
-			or die "Cannot write branch $dest for update: $!\n";
-	}
-
-	if ($tag) {
-		$last_rev = "-" if %$changed_paths;
-		# the tag was 'complex', i.e. did not refer to a "real" revision
-
-		$dest =~ tr/_/\./ if $opt_u;
-
-		system('git', 'tag', '-f', $dest, $cid) == 0
-			or die "Cannot create tag $dest: $!\n";
-
-		print "Created tag '$dest' on '$branch'\n" if $opt_v;
-	}
-	$branches{$branch}{"LAST"} = $cid;
-	$branches{$branch}{$revision} = $cid;
-	$last_rev = $cid;
-	print BRANCHES "$revision $branch $cid\n";
-	print "DONE: $revision $dest $cid\n" if $opt_v;
-}
-
-sub commit_all {
-	# Recursive use of the SVN connection does not work
-	local $svn = $svn2;
-
-	my ($changed_paths, $revision, $author, $date, $message) = @_;
-	my %p;
-	while(my($path,$action) = each %$changed_paths) {
-		$p{$path} = [ $action->action,$action->copyfrom_path, $action->copyfrom_rev, $path ];
-	}
-	$changed_paths = \%p;
-
-	my %done;
-	my @col;
-	my $pref;
-	my $branch;
-
-	while(my($path,$action) = each %$changed_paths) {
-		($branch,$path) = split_path($revision,$path);
-		next if not defined $branch;
-		next if not defined $path;
-		$done{$branch}{$path} = $action;
-	}
-	while(($branch,$changed_paths) = each %done) {
-		commit($branch, $changed_paths, $revision, $author, $date, $message);
-	}
-}
-
-$opt_l = $svn->{'maxrev'} if not defined $opt_l or $opt_l > $svn->{'maxrev'};
-
-if ($opt_l < $current_rev) {
-    print "Up to date: no new revisions to fetch!\n" if $opt_v;
-    unlink("$git_dir/SVN2GIT_HEAD");
-    exit;
-}
-
-print "Processing from $current_rev to $opt_l ...\n" if $opt_v;
-
-my $from_rev;
-my $to_rev = $current_rev - 1;
-
-my $subpool = SVN::Pool::new_default_sub;
-while ($to_rev < $opt_l) {
-	$subpool->clear;
-	$from_rev = $to_rev + 1;
-	$to_rev = $from_rev + $repack_after;
-	$to_rev = $opt_l if $opt_l < $to_rev;
-	print "Fetching from $from_rev to $to_rev ...\n" if $opt_v;
-	$svn->{'svn'}->get_log("",$from_rev,$to_rev,0,1,1,\&commit_all);
-	my $pid = fork();
-	die "Fork: $!\n" unless defined $pid;
-	unless($pid) {
-		exec("git", "repack", "-d")
-			or die "Cannot repack: $!\n";
-	}
-	waitpid($pid, 0);
-}
-
-
-unlink($git_index);
-
-if (defined $orig_git_index) {
-	$ENV{GIT_INDEX_FILE} = $orig_git_index;
-} else {
-	delete $ENV{GIT_INDEX_FILE};
-}
-
-# Now switch back to the branch we were in before all of this happened
-if($orig_branch) {
-	print "DONE\n" if $opt_v and (not defined $opt_l or $opt_l > 0);
-	system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
-		if $forward_master;
-	unless ($opt_i) {
-		system('git', 'read-tree', '-m', '-u', 'SVN2GIT_HEAD', 'HEAD');
-		die "read-tree failed: $?\n" if $?;
-	}
-} else {
-	$orig_branch = "master";
-	print "DONE; creating $orig_branch branch\n" if $opt_v and (not defined $opt_l or $opt_l > 0);
-	system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
-		unless -f "$git_dir/refs/heads/master";
-	system('git', 'update-ref', 'HEAD', "$orig_branch");
-	unless ($opt_i) {
-		system('git checkout');
-		die "checkout failed: $?\n" if $?;
-	}
-}
-unlink("$git_dir/SVN2GIT_HEAD");
-close(BRANCHES);
diff --git a/contrib/examples/git-svnimport.txt b/contrib/examples/git-svnimport.txt
deleted file mode 100644
index 3f0a9c3..0000000
--- a/contrib/examples/git-svnimport.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-git-svnimport(1)
-================
-v0.1, July 2005
-
-NAME
-----
-git-svnimport - Import a SVN repository into git
-
-
-SYNOPSIS
---------
-[verse]
-'git-svnimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]
-		[ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]
-		[ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]
-		[ -s start_chg ] [ -m ] [ -r ] [ -M regex ]
-		[ -I <ignorefile_name> ] [ -A <author_file> ]
-		[ -R <repack_each_revs>] [ -P <path_from_trunk> ]
-		<SVN_repository_URL> [ <path> ]
-
-
-DESCRIPTION
------------
-Imports a SVN repository into git. It will either create a new
-repository, or incrementally import into an existing one.
-
-SVN access is done by the SVN::Perl module.
-
-git-svnimport assumes that SVN repositories are organized into one
-"trunk" directory where the main development happens, "branches/FOO"
-directories for branches, and "/tags/FOO" directories for tags.
-Other subdirectories are ignored.
-
-git-svnimport creates a file ".git/svn2git", which is required for
-incremental SVN imports.
-
-OPTIONS
--------
--C <target-dir>::
-        The GIT repository to import to.  If the directory doesn't
-        exist, it will be created.  Default is the current directory.
-
--s <start_rev>::
-        Start importing at this SVN change number. The  default is 1.
-+
-When importing incrementally, you might need to edit the .git/svn2git file.
-
--i::
-	Import-only: don't perform a checkout after importing.  This option
-	ensures the working directory and index remain untouched and will
-	not create them if they do not exist.
-
--T <trunk_subdir>::
-	Name the SVN trunk. Default "trunk".
-
--t <tag_subdir>::
-	Name the SVN subdirectory for tags. Default "tags".
-
--b <branch_subdir>::
-	Name the SVN subdirectory for branches. Default "branches".
-
--o <branch-for-HEAD>::
-	The 'trunk' branch from SVN is imported to the 'origin' branch within
-	the git repository. Use this option if you want to import into a
-	different branch.
-
--r::
-	Prepend 'rX: ' to commit messages, where X is the imported
-	subversion revision.
-
--u::
-	Replace underscores in tag names with periods.
-
--I <ignorefile_name>::
-	Import the svn:ignore directory property to files with this
-	name in each directory. (The Subversion and GIT ignore
-	syntaxes are similar enough that using the Subversion patterns
-	directly with "-I .gitignore" will almost always just work.)
-
--A <author_file>::
-	Read a file with lines on the form
-+
-------
-	username = User's Full Name <email@addr.es>
-
-------
-+
-and use "User's Full Name <email@addr.es>" as the GIT
-author and committer for Subversion commits made by
-"username". If encountering a commit made by a user not in the
-list, abort.
-+
-For convenience, this data is saved to $GIT_DIR/svn-authors
-each time the -A option is provided, and read from that same
-file each time git-svnimport is run with an existing GIT
-repository without -A.
-
--m::
-	Attempt to detect merges based on the commit message. This option
-	will enable default regexes that try to capture the name source
-	branch name from the commit message.
-
--M <regex>::
-	Attempt to detect merges based on the commit message with a custom
-	regex. It can be used with -m to also see the default regexes.
-	You must escape forward slashes.
-
--l <max_rev>::
-	Specify a maximum revision number to pull.
-+
-Formerly, this option controlled how many revisions to pull,
-due to SVN memory leaks. (These have been worked around.)
-
--R <repack_each_revs>::
-	Specify how often git repository should be repacked.
-+
-The default value is 1000. git-svnimport will do imports in chunks of 1000
-revisions, after each chunk the git repository will be repacked. To disable
-this behavior specify some large value here which is greater than the number of
-revisions to import.
-
--P <path_from_trunk>::
-	Partial import of the SVN tree.
-+
-By default, the whole tree on the SVN trunk (/trunk) is imported.
-'-P my/proj' will import starting only from '/trunk/my/proj'.
-This option is useful when you want to import one project from a
-svn repo which hosts multiple projects under the same trunk.
-
--v::
-	Verbosity: let 'svnimport' report what it is doing.
-
--d::
-	Use direct HTTP requests if possible. The "<path>" argument is used
-	only for retrieving the SVN logs; the path to the contents is
-	included in the SVN log.
-
--D::
-	Use direct HTTP requests if possible. The "<path>" argument is used
-	for retrieving the logs, as well as for the contents.
-+
-There's no safe way to automatically find out which of these options to
-use, so you need to try both. Usually, the one that's wrong will die
-with a 40x error pretty quickly.
-
-<SVN_repository_URL>::
-	The URL of the SVN module you want to import. For local
-	repositories, use "file:///absolute/path".
-+
-If you're using the "-d" or "-D" option, this is the URL of the SVN
-repository itself; it usually ends in "/svn".
-
-<path>::
-	The path to the module you want to check out.
-
--h::
-	Print a short usage message and exit.
-
-OUTPUT
-------
-If '-v' is specified, the script reports what it is doing.
-
-Otherwise, success is indicated the Unix way, i.e. by simply exiting with
-a zero exit status.
-
-Author
-------
-Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from
-various participants of the git-list <git@vger.kernel.org>.
-
-Based on a cvs2git script by the same author.
-
-Documentation
---------------
-Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
-
-GIT
----
-Part of the linkgit:git[7] suite
diff --git a/contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh
deleted file mode 100755
index 1bd8f3c..0000000
--- a/contrib/examples/git-tag.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2005 Linus Torvalds
-
-USAGE='[-n [<num>]] -l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-message_given=
-annotate=
-signed=
-force=
-message=
-username=
-list=
-verify=
-LINES=0
-while test $# != 0
-do
-    case "$1" in
-    -a)
-	annotate=1
-	shift
-	;;
-    -s)
-	annotate=1
-	signed=1
-	shift
-	;;
-    -f)
-	force=1
-	shift
-	;;
-    -n)
-        case "$#,$2" in
-	1,* | *,-*)
-		LINES=1 	# no argument
-		;;
-	*)	shift
-		LINES=$(expr "$1" : '\([0-9]*\)')
-		[ -z "$LINES" ] && LINES=1 # 1 line is default when -n is used
-		;;
-	esac
-	shift
-	;;
-    -l)
-	list=1
-	shift
-	case $# in
-	0)	PATTERN=
-		;;
-	*)
-		PATTERN="$1"	# select tags by shell pattern, not re
-		shift
-		;;
-	esac
-	git rev-parse --symbolic --tags | sort |
-	    while read TAG
-	    do
-	        case "$TAG" in
-		*$PATTERN*) ;;
-		*)	    continue ;;
-		esac
-		[ "$LINES" -le 0 ] && { echo "$TAG"; continue ;}
-		OBJTYPE=$(git cat-file -t "$TAG")
-		case $OBJTYPE in
-		tag)
-			ANNOTATION=$(git cat-file tag "$TAG" |
-				sed -e '1,/^$/d' |
-				sed -n -e "
-					/^-----BEGIN PGP SIGNATURE-----\$/q
-					2,\$s/^/    /
-					p
-					${LINES}q
-				")
-			printf "%-15s %s\n" "$TAG" "$ANNOTATION"
-			;;
-		*)      echo "$TAG"
-			;;
-		esac
-	    done
-	;;
-    -m)
-	annotate=1
-	shift
-	message="$1"
-	if test "$#" = "0"; then
-	    die "error: option -m needs an argument"
-	else
-	    message="$1"
-	    message_given=1
-	    shift
-	fi
-	;;
-    -F)
-	annotate=1
-	shift
-	if test "$#" = "0"; then
-	    die "error: option -F needs an argument"
-	else
-	    message="$(cat "$1")"
-	    message_given=1
-	    shift
-	fi
-	;;
-    -u)
-	annotate=1
-	signed=1
-	shift
-	if test "$#" = "0"; then
-	    die "error: option -u needs an argument"
-	else
-	    username="$1"
-	    shift
-	fi
-	;;
-    -d)
-	shift
-	had_error=0
-	for tag
-	do
-		cur=$(git show-ref --verify --hash -- "refs/tags/$tag") || {
-			echo >&2 "Seriously, what tag are you talking about?"
-			had_error=1
-			continue
-		}
-		git update-ref -m 'tag: delete' -d "refs/tags/$tag" "$cur" || {
-			had_error=1
-			continue
-		}
-		echo "Deleted tag $tag."
-	done
-	exit $had_error
-	;;
-    -v)
-	shift
-	tag_name="$1"
-	tag=$(git show-ref --verify --hash -- "refs/tags/$tag_name") ||
-		die "Seriously, what tag are you talking about?"
-	git-verify-tag -v "$tag"
-	exit $?
-	;;
-    -*)
-        usage
-	;;
-    *)
-	break
-	;;
-    esac
-done
-
-[ -n "$list" ] && exit 0
-
-name="$1"
-[ "$name" ] || usage
-prev=0000000000000000000000000000000000000000
-if git show-ref --verify --quiet -- "refs/tags/$name"
-then
-    test -n "$force" || die "tag '$name' already exists"
-    prev=$(git rev-parse "refs/tags/$name")
-fi
-shift
-git check-ref-format "tags/$name" ||
-	die "we do not like '$name' as a tag name."
-
-object=$(git rev-parse --verify --default HEAD "$@") || exit 1
-type=$(git cat-file -t $object) || exit 1
-tagger=$(git var GIT_COMMITTER_IDENT) || exit 1
-
-test -n "$username" ||
-	username=$(git config user.signingkey) ||
-	username=$(expr "z$tagger" : 'z\(.*>\)')
-
-trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0
-
-if [ "$annotate" ]; then
-    if [ -z "$message_given" ]; then
-        ( echo "#"
-          echo "# Write a tag message"
-          echo "#" ) > "$GIT_DIR"/TAG_EDITMSG
-        git_editor "$GIT_DIR"/TAG_EDITMSG || exit
-    else
-        printf '%s\n' "$message" >"$GIT_DIR"/TAG_EDITMSG
-    fi
-
-    grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG |
-    git stripspace >"$GIT_DIR"/TAG_FINALMSG
-
-    [ -s "$GIT_DIR"/TAG_FINALMSG -o -n "$message_given" ] || {
-	echo >&2 "No tag message?"
-	exit 1
-    }
-
-    ( printf 'object %s\ntype %s\ntag %s\ntagger %s\n\n' \
-	"$object" "$type" "$name" "$tagger";
-      cat "$GIT_DIR"/TAG_FINALMSG ) >"$GIT_DIR"/TAG_TMP
-    rm -f "$GIT_DIR"/TAG_TMP.asc "$GIT_DIR"/TAG_FINALMSG
-    if [ "$signed" ]; then
-	gpg -bsa -u "$username" "$GIT_DIR"/TAG_TMP &&
-	cat "$GIT_DIR"/TAG_TMP.asc >>"$GIT_DIR"/TAG_TMP ||
-	die "failed to sign the tag with GPG."
-    fi
-    object=$(git-mktag < "$GIT_DIR"/TAG_TMP)
-fi
-
-git update-ref "refs/tags/$name" "$object" "$prev"
diff --git a/contrib/examples/git-verify-tag.sh b/contrib/examples/git-verify-tag.sh
deleted file mode 100755
index 0902a5c..0000000
--- a/contrib/examples/git-verify-tag.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-USAGE='<tag>'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-verbose=
-while test $# != 0
-do
-	case "$1" in
-	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
-		verbose=t ;;
-	*)
-		break ;;
-	esac
-	shift
-done
-
-if [ "$#" != "1" ]
-then
-	usage
-fi
-
-type="$(git cat-file -t "$1" 2>/dev/null)" ||
-	die "$1: no such object."
-
-test "$type" = tag ||
-	die "$1: cannot verify a non-tag object of type $type."
-
-case "$verbose" in
-t)
-	git cat-file -p "$1" |
-	sed -n -e '/^-----BEGIN PGP SIGNATURE-----/q' -e p
-	;;
-esac
-
-trap 'rm -f "$GIT_DIR/.tmp-vtag"' 0
-
-git cat-file tag "$1" >"$GIT_DIR/.tmp-vtag" || exit 1
-sed -n -e '
-	/^-----BEGIN PGP SIGNATURE-----$/q
-	p
-' <"$GIT_DIR/.tmp-vtag" |
-gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
-rm -f "$GIT_DIR/.tmp-vtag"
diff --git a/contrib/examples/git-whatchanged.sh b/contrib/examples/git-whatchanged.sh
deleted file mode 100755
index 2edbdc6..0000000
--- a/contrib/examples/git-whatchanged.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-USAGE='[-p] [--max-count=<n>] [<since>..<limit>] [--pretty=<format>] [-m] [git-diff-tree options] [git-rev-list options]'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-diff_tree_flags=$(git-rev-parse --sq --no-revs --flags "$@") || exit
-case "$0" in
-*whatchanged)
-	count=
-	test -z "$diff_tree_flags" &&
-		diff_tree_flags=$(git config --get whatchanged.difftree)
-	diff_tree_default_flags='-c -M --abbrev' ;;
-*show)
-	count=-n1
-	test -z "$diff_tree_flags" &&
-		diff_tree_flags=$(git config --get show.difftree)
-	diff_tree_default_flags='--cc --always' ;;
-esac
-test -z "$diff_tree_flags" &&
-	diff_tree_flags="$diff_tree_default_flags"
-
-rev_list_args=$(git-rev-parse --sq --default HEAD --revs-only "$@") &&
-diff_tree_args=$(git-rev-parse --sq --no-revs --no-flags "$@") &&
-
-eval "git-rev-list $count $rev_list_args" |
-eval "git-diff-tree --stdin --pretty -r $diff_tree_flags $diff_tree_args" |
-LESS="$LESS -S" ${PAGER:-less}
diff --git a/contrib/hooks/pre-auto-gc-battery b/contrib/hooks/pre-auto-gc-battery
index 6a2cdeb..7ba78c4 100755
--- a/contrib/hooks/pre-auto-gc-battery
+++ b/contrib/hooks/pre-auto-gc-battery
@@ -17,7 +17,7 @@
 # ln -sf /usr/share/git-core/contrib/hooks/pre-auto-gc-battery \
 #	hooks/pre-auto-gc
 
-if test -x /sbin/on_ac_power && /sbin/on_ac_power
+if test -x /sbin/on_ac_power && (/sbin/on_ac_power;test $? -ne 1)
 then
 	exit 0
 elif test "$(cat /sys/class/power_supply/AC/online 2>/dev/null)" = 1
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index dec085a..d3f39a8 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -297,7 +297,7 @@ find_latest_squash () {
 	main=
 	sub=
 	git log --grep="^git-subtree-dir: $dir/*\$" \
-		--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
+		--no-show-signature --pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
 	while read a b junk
 	do
 		debug "$a $b $junk"
@@ -341,7 +341,7 @@ find_existing_splits () {
 	main=
 	sub=
 	git log --grep="^git-subtree-dir: $dir/*\$" \
-		--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
+		--no-show-signature --pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
 	while read a b junk
 	do
 		case "$a" in
@@ -382,7 +382,7 @@ copy_commit () {
 	# We're going to set some environment vars here, so
 	# do it in a subshell to get rid of them safely later
 	debug copy_commit "{$1}" "{$2}" "{$3}"
-	git log -1 --pretty=format:'%an%n%ae%n%aD%n%cn%n%ce%n%cD%n%B' "$1" |
+	git log -1 --no-show-signature --pretty=format:'%an%n%ae%n%aD%n%cn%n%ce%n%cD%n%B' "$1" |
 	(
 		read GIT_AUTHOR_NAME
 		read GIT_AUTHOR_EMAIL
@@ -462,8 +462,8 @@ squash_msg () {
 		oldsub_short=$(git rev-parse --short "$oldsub")
 		echo "Squashed '$dir/' changes from $oldsub_short..$newsub_short"
 		echo
-		git log --pretty=tformat:'%h %s' "$oldsub..$newsub"
-		git log --pretty=tformat:'REVERT: %h %s' "$newsub..$oldsub"
+		git log --no-show-signature --pretty=tformat:'%h %s' "$oldsub..$newsub"
+		git log --no-show-signature --pretty=tformat:'REVERT: %h %s' "$newsub..$oldsub"
 	else
 		echo "Squashed '$dir/' content from commit $newsub_short"
 	fi
@@ -475,7 +475,7 @@ squash_msg () {
 
 toptree_for_commit () {
 	commit="$1"
-	git log -1 --pretty=format:'%T' "$commit" -- || exit $?
+	git rev-parse --verify "$commit^{tree}" || exit $?
 }
 
 subtree_for_commit () {
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 60d76cd..352deda 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -28,7 +28,7 @@ as a subdirectory of your application.
 
 Subtrees are not to be confused with submodules, which are meant for
 the same task. Unlike submodules, subtrees do not need any special
-constructions (like .gitmodule files or gitlinks) be present in
+constructions (like .gitmodules files or gitlinks) be present in
 your repository, and do not force end-users of your
 repository to do anything special or to understand how subtrees
 work. A subtree is just a subdirectory that can be
diff --git a/convert.c b/convert.c
index b976eb9..c480097 100644
--- a/convert.c
+++ b/convert.c
@@ -898,7 +898,7 @@ static int ident_to_git(const char *path, const char *src, size_t len,
 static int ident_to_worktree(const char *path, const char *src, size_t len,
                              struct strbuf *buf, int ident)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 	char *to_free = NULL, *dollar, *spc;
 	int cnt;
 
@@ -912,9 +912,9 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
 	/* are we "faking" in place editing ? */
 	if (src == buf->buf)
 		to_free = strbuf_detach(buf, NULL);
-	hash_sha1_file(src, len, "blob", sha1);
+	hash_object_file(src, len, "blob", &oid);
 
-	strbuf_grow(buf, len + cnt * 43);
+	strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3));
 	for (;;) {
 		/* step 1: run to the next '$' */
 		dollar = memchr(src, '$', len);
@@ -969,7 +969,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
 
 		/* step 4: substitute */
 		strbuf_addstr(buf, "Id: ");
-		strbuf_add(buf, sha1_to_hex(sha1), 40);
+		strbuf_addstr(buf, oid_to_hex(&oid));
 		strbuf_addstr(buf, " $");
 	}
 	strbuf_add(buf, src, len);
@@ -1510,7 +1510,7 @@ struct ident_filter {
 	struct stream_filter filter;
 	struct strbuf left;
 	int state;
-	char ident[45]; /* ": x40 $" */
+	char ident[GIT_MAX_HEXSZ + 5]; /* ": x40 $" */
 };
 
 static int is_foreign_ident(const char *str)
@@ -1635,12 +1635,12 @@ static struct stream_filter_vtbl ident_vtbl = {
 	ident_free_fn,
 };
 
-static struct stream_filter *ident_filter(const unsigned char *sha1)
+static struct stream_filter *ident_filter(const struct object_id *oid)
 {
 	struct ident_filter *ident = xmalloc(sizeof(*ident));
 
 	xsnprintf(ident->ident, sizeof(ident->ident),
-		  ": %s $", sha1_to_hex(sha1));
+		  ": %s $", oid_to_hex(oid));
 	strbuf_init(&ident->left, 0);
 	ident->filter.vtbl = &ident_vtbl;
 	ident->state = 0;
@@ -1655,7 +1655,7 @@ static struct stream_filter *ident_filter(const unsigned char *sha1)
  * Note that you would be crazy to set CRLF, smuge/clean or ident to a
  * large binary blob you would want us not to slurp into the memory!
  */
-struct stream_filter *get_stream_filter(const char *path, const unsigned char *sha1)
+struct stream_filter *get_stream_filter(const char *path, const struct object_id *oid)
 {
 	struct conv_attrs ca;
 	struct stream_filter *filter = NULL;
@@ -1668,7 +1668,7 @@ struct stream_filter *get_stream_filter(const char *path, const unsigned char *s
 		return NULL;
 
 	if (ca.ident)
-		filter = ident_filter(sha1);
+		filter = ident_filter(oid);
 
 	if (output_eol(ca.crlf_action) == EOL_CRLF)
 		filter = cascade_filter(filter, lf_to_crlf_filter());
diff --git a/convert.h b/convert.h
index 65ab3e5..2e9b4f4 100644
--- a/convert.h
+++ b/convert.h
@@ -93,7 +93,7 @@ extern int would_convert_to_git_filter_fd(const char *path);
 
 struct stream_filter; /* opaque */
 
-extern struct stream_filter *get_stream_filter(const char *path, const unsigned char *);
+extern struct stream_filter *get_stream_filter(const char *path, const struct object_id *);
 extern void free_stream_filter(struct stream_filter *);
 extern int is_null_stream_filter(struct stream_filter *);
 
diff --git a/csum-file.c b/csum-file.c
index 2adae04..5eda7fb 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -11,7 +11,7 @@
 #include "progress.h"
 #include "csum-file.h"
 
-static void flush(struct sha1file *f, const void *buf, unsigned int count)
+static void flush(struct hashfile *f, const void *buf, unsigned int count)
 {
 	if (0 <= f->check_fd && count)  {
 		unsigned char check_buffer[8192];
@@ -42,28 +42,28 @@ static void flush(struct sha1file *f, const void *buf, unsigned int count)
 	}
 }
 
-void sha1flush(struct sha1file *f)
+void hashflush(struct hashfile *f)
 {
 	unsigned offset = f->offset;
 
 	if (offset) {
-		git_SHA1_Update(&f->ctx, f->buffer, offset);
+		the_hash_algo->update_fn(&f->ctx, f->buffer, offset);
 		flush(f, f->buffer, offset);
 		f->offset = 0;
 	}
 }
 
-int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
+int hashclose(struct hashfile *f, unsigned char *result, unsigned int flags)
 {
 	int fd;
 
-	sha1flush(f);
-	git_SHA1_Final(f->buffer, &f->ctx);
+	hashflush(f);
+	the_hash_algo->final_fn(f->buffer, &f->ctx);
 	if (result)
 		hashcpy(result, f->buffer);
 	if (flags & (CSUM_CLOSE | CSUM_FSYNC)) {
 		/* write checksum and close fd */
-		flush(f, f->buffer, 20);
+		flush(f, f->buffer, the_hash_algo->rawsz);
 		if (flags & CSUM_FSYNC)
 			fsync_or_die(f->fd, f->name);
 		if (close(f->fd))
@@ -86,7 +86,7 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
 	return fd;
 }
 
-void sha1write(struct sha1file *f, const void *buf, unsigned int count)
+void hashwrite(struct hashfile *f, const void *buf, unsigned int count)
 {
 	while (count) {
 		unsigned offset = f->offset;
@@ -110,7 +110,7 @@ void sha1write(struct sha1file *f, const void *buf, unsigned int count)
 		buf = (char *) buf + nr;
 		left -= nr;
 		if (!left) {
-			git_SHA1_Update(&f->ctx, data, offset);
+			the_hash_algo->update_fn(&f->ctx, data, offset);
 			flush(f, data, offset);
 			offset = 0;
 		}
@@ -118,15 +118,15 @@ void sha1write(struct sha1file *f, const void *buf, unsigned int count)
 	}
 }
 
-struct sha1file *sha1fd(int fd, const char *name)
+struct hashfile *hashfd(int fd, const char *name)
 {
-	return sha1fd_throughput(fd, name, NULL);
+	return hashfd_throughput(fd, name, NULL);
 }
 
-struct sha1file *sha1fd_check(const char *name)
+struct hashfile *hashfd_check(const char *name)
 {
 	int sink, check;
-	struct sha1file *f;
+	struct hashfile *f;
 
 	sink = open("/dev/null", O_WRONLY);
 	if (sink < 0)
@@ -134,14 +134,14 @@ struct sha1file *sha1fd_check(const char *name)
 	check = open(name, O_RDONLY);
 	if (check < 0)
 		die_errno("unable to open '%s'", name);
-	f = sha1fd(sink, name);
+	f = hashfd(sink, name);
 	f->check_fd = check;
 	return f;
 }
 
-struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp)
+struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp)
 {
-	struct sha1file *f = xmalloc(sizeof(*f));
+	struct hashfile *f = xmalloc(sizeof(*f));
 	f->fd = fd;
 	f->check_fd = -1;
 	f->offset = 0;
@@ -149,18 +149,18 @@ struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp
 	f->tp = tp;
 	f->name = name;
 	f->do_crc = 0;
-	git_SHA1_Init(&f->ctx);
+	the_hash_algo->init_fn(&f->ctx);
 	return f;
 }
 
-void sha1file_checkpoint(struct sha1file *f, struct sha1file_checkpoint *checkpoint)
+void hashfile_checkpoint(struct hashfile *f, struct hashfile_checkpoint *checkpoint)
 {
-	sha1flush(f);
+	hashflush(f);
 	checkpoint->offset = f->total;
 	checkpoint->ctx = f->ctx;
 }
 
-int sha1file_truncate(struct sha1file *f, struct sha1file_checkpoint *checkpoint)
+int hashfile_truncate(struct hashfile *f, struct hashfile_checkpoint *checkpoint)
 {
 	off_t offset = checkpoint->offset;
 
@@ -169,17 +169,17 @@ int sha1file_truncate(struct sha1file *f, struct sha1file_checkpoint *checkpoint
 		return -1;
 	f->total = offset;
 	f->ctx = checkpoint->ctx;
-	f->offset = 0; /* sha1flush() was called in checkpoint */
+	f->offset = 0; /* hashflush() was called in checkpoint */
 	return 0;
 }
 
-void crc32_begin(struct sha1file *f)
+void crc32_begin(struct hashfile *f)
 {
 	f->crc32 = crc32(0, NULL, 0);
 	f->do_crc = 1;
 }
 
-uint32_t crc32_end(struct sha1file *f)
+uint32_t crc32_end(struct hashfile *f)
 {
 	f->do_crc = 0;
 	return f->crc32;
diff --git a/csum-file.h b/csum-file.h
index 7530927..992e5c0 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -4,11 +4,11 @@
 struct progress;
 
 /* A SHA1-protected file */
-struct sha1file {
+struct hashfile {
 	int fd;
 	int check_fd;
 	unsigned int offset;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 	off_t total;
 	struct progress *tp;
 	const char *name;
@@ -18,36 +18,36 @@ struct sha1file {
 };
 
 /* Checkpoint */
-struct sha1file_checkpoint {
+struct hashfile_checkpoint {
 	off_t offset;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 };
 
-extern void sha1file_checkpoint(struct sha1file *, struct sha1file_checkpoint *);
-extern int sha1file_truncate(struct sha1file *, struct sha1file_checkpoint *);
+extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *);
+extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *);
 
-/* sha1close flags */
+/* hashclose flags */
 #define CSUM_CLOSE	1
 #define CSUM_FSYNC	2
 
-extern struct sha1file *sha1fd(int fd, const char *name);
-extern struct sha1file *sha1fd_check(const char *name);
-extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
-extern int sha1close(struct sha1file *, unsigned char *, unsigned int);
-extern void sha1write(struct sha1file *, const void *, unsigned int);
-extern void sha1flush(struct sha1file *f);
-extern void crc32_begin(struct sha1file *);
-extern uint32_t crc32_end(struct sha1file *);
+extern struct hashfile *hashfd(int fd, const char *name);
+extern struct hashfile *hashfd_check(const char *name);
+extern struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp);
+extern int hashclose(struct hashfile *, unsigned char *, unsigned int);
+extern void hashwrite(struct hashfile *, const void *, unsigned int);
+extern void hashflush(struct hashfile *f);
+extern void crc32_begin(struct hashfile *);
+extern uint32_t crc32_end(struct hashfile *);
 
-static inline void sha1write_u8(struct sha1file *f, uint8_t data)
+static inline void hashwrite_u8(struct hashfile *f, uint8_t data)
 {
-	sha1write(f, &data, sizeof(data));
+	hashwrite(f, &data, sizeof(data));
 }
 
-static inline void sha1write_be32(struct sha1file *f, uint32_t data)
+static inline void hashwrite_be32(struct hashfile *f, uint32_t data)
 {
 	data = htonl(data);
-	sha1write(f, &data, sizeof(data));
+	hashwrite(f, &data, sizeof(data));
 }
 
 #endif
diff --git a/daemon.c b/daemon.c
index 72dfeaf..fe833ea 100644
--- a/daemon.c
+++ b/daemon.c
@@ -9,7 +9,12 @@
 #define initgroups(x, y) (0) /* nothing */
 #endif
 
-static int log_syslog;
+static enum log_destination {
+	LOG_DESTINATION_UNSET = -1,
+	LOG_DESTINATION_NONE = 0,
+	LOG_DESTINATION_STDERR = 1,
+	LOG_DESTINATION_SYSLOG = 2,
+} log_destination = LOG_DESTINATION_UNSET;
 static int verbose;
 static int reuseaddr;
 static int informative_errors;
@@ -25,6 +30,7 @@ static const char daemon_usage[] =
 "           [--access-hook=<path>]\n"
 "           [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>]\n"
 "                      [--detach] [--user=<user> [--group=<group>]]\n"
+"           [--log-destination=(stderr|syslog|none)]\n"
 "           [<directory>...]";
 
 /* List of acceptable pathname prefixes */
@@ -74,11 +80,14 @@ static const char *get_ip_address(struct hostinfo *hi)
 
 static void logreport(int priority, const char *err, va_list params)
 {
-	if (log_syslog) {
+	switch (log_destination) {
+	case LOG_DESTINATION_SYSLOG: {
 		char buf[1024];
 		vsnprintf(buf, sizeof(buf), err, params);
 		syslog(priority, "%s", buf);
-	} else {
+		break;
+	}
+	case LOG_DESTINATION_STDERR:
 		/*
 		 * Since stderr is set to buffered mode, the
 		 * logging of different processes will not overlap
@@ -88,6 +97,11 @@ static void logreport(int priority, const char *err, va_list params)
 		vfprintf(stderr, err, params);
 		fputc('\n', stderr);
 		fflush(stderr);
+		break;
+	case LOG_DESTINATION_NONE:
+		break;
+	case LOG_DESTINATION_UNSET:
+		BUG("log destination not initialized correctly");
 	}
 }
 
@@ -1286,7 +1300,6 @@ int cmd_main(int argc, const char **argv)
 		}
 		if (!strcmp(arg, "--inetd")) {
 			inetd_mode = 1;
-			log_syslog = 1;
 			continue;
 		}
 		if (!strcmp(arg, "--verbose")) {
@@ -1294,9 +1307,22 @@ int cmd_main(int argc, const char **argv)
 			continue;
 		}
 		if (!strcmp(arg, "--syslog")) {
-			log_syslog = 1;
+			log_destination = LOG_DESTINATION_SYSLOG;
 			continue;
 		}
+		if (skip_prefix(arg, "--log-destination=", &v)) {
+			if (!strcmp(v, "syslog")) {
+				log_destination = LOG_DESTINATION_SYSLOG;
+				continue;
+			} else if (!strcmp(v, "stderr")) {
+				log_destination = LOG_DESTINATION_STDERR;
+				continue;
+			} else if (!strcmp(v, "none")) {
+				log_destination = LOG_DESTINATION_NONE;
+				continue;
+			} else
+				die("unknown log destination '%s'", v);
+		}
 		if (!strcmp(arg, "--export-all")) {
 			export_all_trees = 1;
 			continue;
@@ -1353,7 +1379,6 @@ int cmd_main(int argc, const char **argv)
 		}
 		if (!strcmp(arg, "--detach")) {
 			detach = 1;
-			log_syslog = 1;
 			continue;
 		}
 		if (skip_prefix(arg, "--user=", &v)) {
@@ -1399,7 +1424,14 @@ int cmd_main(int argc, const char **argv)
 		usage(daemon_usage);
 	}
 
-	if (log_syslog) {
+	if (log_destination == LOG_DESTINATION_UNSET) {
+		if (inetd_mode || detach)
+			log_destination = LOG_DESTINATION_SYSLOG;
+		else
+			log_destination = LOG_DESTINATION_STDERR;
+	}
+
+	if (log_destination == LOG_DESTINATION_SYSLOG) {
 		openlog("git-daemon", LOG_PID, LOG_DAEMON);
 		set_die_routine(daemon_die);
 	} else
diff --git a/diff-lib.c b/diff-lib.c
index 8104603..104f954 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -92,6 +92,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 	int diff_unmerged_stage = revs->max_count;
 	unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
 			      ? CE_MATCH_RACY_IS_DIRTY : 0);
+	uint64_t start = getnanotime();
 
 	diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
 
@@ -246,6 +247,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 	}
 	diffcore_std(&revs->diffopt);
 	diff_flush(&revs->diffopt);
+	trace_performance_since(start, "diff-files");
 	return 0;
 }
 
@@ -302,7 +304,7 @@ static int get_stat_data(const struct cache_entry *ce,
 }
 
 static void show_new_file(struct rev_info *revs,
-			  const struct cache_entry *new,
+			  const struct cache_entry *new_file,
 			  int cached, int match_missing)
 {
 	const struct object_id *oid;
@@ -313,16 +315,16 @@ static void show_new_file(struct rev_info *revs,
 	 * New file in the index: it might actually be different in
 	 * the working tree.
 	 */
-	if (get_stat_data(new, &oid, &mode, cached, match_missing,
+	if (get_stat_data(new_file, &oid, &mode, cached, match_missing,
 	    &dirty_submodule, &revs->diffopt) < 0)
 		return;
 
-	diff_index_show_file(revs, "+", new, oid, !is_null_oid(oid), mode, dirty_submodule);
+	diff_index_show_file(revs, "+", new_file, oid, !is_null_oid(oid), mode, dirty_submodule);
 }
 
 static int show_modified(struct rev_info *revs,
-			 const struct cache_entry *old,
-			 const struct cache_entry *new,
+			 const struct cache_entry *old_entry,
+			 const struct cache_entry *new_entry,
 			 int report_missing,
 			 int cached, int match_missing)
 {
@@ -330,47 +332,47 @@ static int show_modified(struct rev_info *revs,
 	const struct object_id *oid;
 	unsigned dirty_submodule = 0;
 
-	if (get_stat_data(new, &oid, &mode, cached, match_missing,
+	if (get_stat_data(new_entry, &oid, &mode, cached, match_missing,
 			  &dirty_submodule, &revs->diffopt) < 0) {
 		if (report_missing)
-			diff_index_show_file(revs, "-", old,
-					     &old->oid, 1, old->ce_mode,
+			diff_index_show_file(revs, "-", old_entry,
+					     &old_entry->oid, 1, old_entry->ce_mode,
 					     0);
 		return -1;
 	}
 
 	if (revs->combine_merges && !cached &&
-	    (oidcmp(oid, &old->oid) || oidcmp(&old->oid, &new->oid))) {
+	    (oidcmp(oid, &old_entry->oid) || oidcmp(&old_entry->oid, &new_entry->oid))) {
 		struct combine_diff_path *p;
-		int pathlen = ce_namelen(new);
+		int pathlen = ce_namelen(new_entry);
 
 		p = xmalloc(combine_diff_path_size(2, pathlen));
 		p->path = (char *) &p->parent[2];
 		p->next = NULL;
-		memcpy(p->path, new->name, pathlen);
+		memcpy(p->path, new_entry->name, pathlen);
 		p->path[pathlen] = 0;
 		p->mode = mode;
 		oidclr(&p->oid);
 		memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
 		p->parent[0].status = DIFF_STATUS_MODIFIED;
-		p->parent[0].mode = new->ce_mode;
-		oidcpy(&p->parent[0].oid, &new->oid);
+		p->parent[0].mode = new_entry->ce_mode;
+		oidcpy(&p->parent[0].oid, &new_entry->oid);
 		p->parent[1].status = DIFF_STATUS_MODIFIED;
-		p->parent[1].mode = old->ce_mode;
-		oidcpy(&p->parent[1].oid, &old->oid);
+		p->parent[1].mode = old_entry->ce_mode;
+		oidcpy(&p->parent[1].oid, &old_entry->oid);
 		show_combined_diff(p, 2, revs->dense_combined_merges, revs);
 		free(p);
 		return 0;
 	}
 
-	oldmode = old->ce_mode;
-	if (mode == oldmode && !oidcmp(oid, &old->oid) && !dirty_submodule &&
+	oldmode = old_entry->ce_mode;
+	if (mode == oldmode && !oidcmp(oid, &old_entry->oid) && !dirty_submodule &&
 	    !revs->diffopt.flags.find_copies_harder)
 		return 0;
 
 	diff_change(&revs->diffopt, oldmode, mode,
-		    &old->oid, oid, 1, !is_null_oid(oid),
-		    old->name, 0, dirty_submodule);
+		    &old_entry->oid, oid, 1, !is_null_oid(oid),
+		    old_entry->name, 0, dirty_submodule);
 	return 0;
 }
 
@@ -512,6 +514,7 @@ static int diff_cache(struct rev_info *revs,
 int run_diff_index(struct rev_info *revs, int cached)
 {
 	struct object_array_entry *ent;
+	uint64_t start = getnanotime();
 
 	ent = revs->pending.objects;
 	if (diff_cache(revs, &ent->item->oid, ent->name, cached))
@@ -521,6 +524,7 @@ int run_diff_index(struct rev_info *revs, int cached)
 	diffcore_fix_diff_index(&revs->diffopt);
 	diffcore_std(&revs->diffopt);
 	diff_flush(&revs->diffopt);
+	trace_performance_since(start, "diff-index");
 	return 0;
 }
 
diff --git a/diff.c b/diff.c
index 21c3838..1289df4 100644
--- a/diff.c
+++ b/diff.c
@@ -1504,7 +1504,7 @@ struct diff_words_style_elem {
 
 struct diff_words_style {
 	enum diff_words_type type;
-	struct diff_words_style_elem new, old, ctx;
+	struct diff_words_style_elem new_word, old_word, ctx;
 	const char *newline;
 };
 
@@ -1655,12 +1655,12 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
 	}
 	if (minus_begin != minus_end) {
 		fn_out_diff_words_write_helper(diff_words->opt,
-				&style->old, style->newline,
+				&style->old_word, style->newline,
 				minus_end - minus_begin, minus_begin);
 	}
 	if (plus_begin != plus_end) {
 		fn_out_diff_words_write_helper(diff_words->opt,
-				&style->new, style->newline,
+				&style->new_word, style->newline,
 				plus_end - plus_begin, plus_begin);
 	}
 
@@ -1758,7 +1758,7 @@ static void diff_words_show(struct diff_words_data *diff_words)
 		emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
 				 line_prefix, strlen(line_prefix), 0);
 		fn_out_diff_words_write_helper(diff_words->opt,
-			&style->old, style->newline,
+			&style->old_word, style->newline,
 			diff_words->minus.text.size,
 			diff_words->minus.text.ptr);
 		diff_words->minus.text.size = 0;
@@ -1883,8 +1883,8 @@ static void init_diff_words_data(struct emit_callback *ecbdata,
 	}
 	if (want_color(o->use_color)) {
 		struct diff_words_style *st = ecbdata->diff_words->style;
-		st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
-		st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
+		st->old_word.color = diff_get_color_opt(o, DIFF_FILE_OLD);
+		st->new_word.color = diff_get_color_opt(o, DIFF_FILE_NEW);
 		st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
 	}
 }
@@ -2045,11 +2045,10 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 	}
 }
 
-static char *pprint_rename(const char *a, const char *b)
+static void pprint_rename(struct strbuf *name, const char *a, const char *b)
 {
-	const char *old = a;
-	const char *new = b;
-	struct strbuf name = STRBUF_INIT;
+	const char *old_name = a;
+	const char *new_name = b;
 	int pfx_length, sfx_length;
 	int pfx_adjust_for_slash;
 	int len_a = strlen(a);
@@ -2059,24 +2058,24 @@ static char *pprint_rename(const char *a, const char *b)
 	int qlen_b = quote_c_style(b, NULL, NULL, 0);
 
 	if (qlen_a || qlen_b) {
-		quote_c_style(a, &name, NULL, 0);
-		strbuf_addstr(&name, " => ");
-		quote_c_style(b, &name, NULL, 0);
-		return strbuf_detach(&name, NULL);
+		quote_c_style(a, name, NULL, 0);
+		strbuf_addstr(name, " => ");
+		quote_c_style(b, name, NULL, 0);
+		return;
 	}
 
 	/* Find common prefix */
 	pfx_length = 0;
-	while (*old && *new && *old == *new) {
-		if (*old == '/')
-			pfx_length = old - a + 1;
-		old++;
-		new++;
+	while (*old_name && *new_name && *old_name == *new_name) {
+		if (*old_name == '/')
+			pfx_length = old_name - a + 1;
+		old_name++;
+		new_name++;
 	}
 
 	/* Find common suffix */
-	old = a + len_a;
-	new = b + len_b;
+	old_name = a + len_a;
+	new_name = b + len_b;
 	sfx_length = 0;
 	/*
 	 * If there is a common prefix, it must end in a slash.  In
@@ -2087,13 +2086,13 @@ static char *pprint_rename(const char *a, const char *b)
 	 * underrun the input strings.
 	 */
 	pfx_adjust_for_slash = (pfx_length ? 1 : 0);
-	while (a + pfx_length - pfx_adjust_for_slash <= old &&
-	       b + pfx_length - pfx_adjust_for_slash <= new &&
-	       *old == *new) {
-		if (*old == '/')
-			sfx_length = len_a - (old - a);
-		old--;
-		new--;
+	while (a + pfx_length - pfx_adjust_for_slash <= old_name &&
+	       b + pfx_length - pfx_adjust_for_slash <= new_name &&
+	       *old_name == *new_name) {
+		if (*old_name == '/')
+			sfx_length = len_a - (old_name - a);
+		old_name--;
+		new_name--;
 	}
 
 	/*
@@ -2109,19 +2108,18 @@ static char *pprint_rename(const char *a, const char *b)
 	if (b_midlen < 0)
 		b_midlen = 0;
 
-	strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
+	strbuf_grow(name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
 	if (pfx_length + sfx_length) {
-		strbuf_add(&name, a, pfx_length);
-		strbuf_addch(&name, '{');
+		strbuf_add(name, a, pfx_length);
+		strbuf_addch(name, '{');
 	}
-	strbuf_add(&name, a + pfx_length, a_midlen);
-	strbuf_addstr(&name, " => ");
-	strbuf_add(&name, b + pfx_length, b_midlen);
+	strbuf_add(name, a + pfx_length, a_midlen);
+	strbuf_addstr(name, " => ");
+	strbuf_add(name, b + pfx_length, b_midlen);
 	if (pfx_length + sfx_length) {
-		strbuf_addch(&name, '}');
-		strbuf_add(&name, a + len_a - sfx_length, sfx_length);
+		strbuf_addch(name, '}');
+		strbuf_add(name, a + len_a - sfx_length, sfx_length);
 	}
-	return strbuf_detach(&name, NULL);
 }
 
 struct diffstat_t {
@@ -2131,6 +2129,7 @@ struct diffstat_t {
 		char *from_name;
 		char *name;
 		char *print_name;
+		const char *comments;
 		unsigned is_unmerged:1;
 		unsigned is_binary:1;
 		unsigned is_renamed:1;
@@ -2197,23 +2196,20 @@ static void show_graph(struct strbuf *out, char ch, int cnt,
 
 static void fill_print_name(struct diffstat_file *file)
 {
-	char *pname;
+	struct strbuf pname = STRBUF_INIT;
 
 	if (file->print_name)
 		return;
 
-	if (!file->is_renamed) {
-		struct strbuf buf = STRBUF_INIT;
-		if (quote_c_style(file->name, &buf, NULL, 0)) {
-			pname = strbuf_detach(&buf, NULL);
-		} else {
-			pname = file->name;
-			strbuf_release(&buf);
-		}
-	} else {
-		pname = pprint_rename(file->from_name, file->name);
-	}
-	file->print_name = pname;
+	if (file->is_renamed)
+		pprint_rename(&pname, file->from_name, file->name);
+	else
+		quote_c_style(file->name, &pname, NULL, 0);
+
+	if (file->comments)
+		strbuf_addf(&pname, " (%s)", file->comments);
+
+	file->print_name = strbuf_detach(&pname, NULL);
 }
 
 static void print_stat_summary_inserts_deletes(struct diff_options *options,
@@ -2594,14 +2590,14 @@ struct dirstat_dir {
 static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
 		unsigned long changed, const char *base, int baselen)
 {
-	unsigned long this_dir = 0;
+	unsigned long sum_changes = 0;
 	unsigned int sources = 0;
 	const char *line_prefix = diff_line_prefix(opt);
 
 	while (dir->nr) {
 		struct dirstat_file *f = dir->files;
 		int namelen = strlen(f->name);
-		unsigned long this;
+		unsigned long changes;
 		char *slash;
 
 		if (namelen < baselen)
@@ -2611,15 +2607,15 @@ static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
 		slash = strchr(f->name + baselen, '/');
 		if (slash) {
 			int newbaselen = slash + 1 - f->name;
-			this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
+			changes = gather_dirstat(opt, dir, changed, f->name, newbaselen);
 			sources++;
 		} else {
-			this = f->changed;
+			changes = f->changed;
 			dir->files++;
 			dir->nr--;
 			sources += 2;
 		}
-		this_dir += this;
+		sum_changes += changes;
 	}
 
 	/*
@@ -2629,8 +2625,8 @@ static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
 	 *    under this directory (sources == 1).
 	 */
 	if (baselen && sources != 1) {
-		if (this_dir) {
-			int permille = this_dir * 1000 / changed;
+		if (sum_changes) {
+			int permille = sum_changes * 1000 / changed;
 			if (permille >= dir->permille) {
 				fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
 					permille / 10, permille % 10, baselen, base);
@@ -2639,7 +2635,7 @@ static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
 			}
 		}
 	}
-	return this_dir;
+	return sum_changes;
 }
 
 static int dirstat_compare(const void *_a, const void *_b)
@@ -2797,8 +2793,7 @@ static void free_diffstat_info(struct diffstat_t *diffstat)
 	int i;
 	for (i = 0; i < diffstat->nr; i++) {
 		struct diffstat_file *f = diffstat->files[i];
-		if (f->name != f->print_name)
-			free(f->print_name);
+		free(f->print_name);
 		free(f->name);
 		free(f->from_name);
 		free(f);
@@ -3248,6 +3243,32 @@ static void builtin_diff(const char *name_a,
 	return;
 }
 
+static char *get_compact_summary(const struct diff_filepair *p, int is_renamed)
+{
+	if (!is_renamed) {
+		if (p->status == DIFF_STATUS_ADDED) {
+			if (S_ISLNK(p->two->mode))
+				return "new +l";
+			else if ((p->two->mode & 0777) == 0755)
+				return "new +x";
+			else
+				return "new";
+		} else if (p->status == DIFF_STATUS_DELETED)
+			return "gone";
+	}
+	if (S_ISLNK(p->one->mode) && !S_ISLNK(p->two->mode))
+		return "mode -l";
+	else if (!S_ISLNK(p->one->mode) && S_ISLNK(p->two->mode))
+		return "mode +l";
+	else if ((p->one->mode & 0777) == 0644 &&
+		 (p->two->mode & 0777) == 0755)
+		return "mode +x";
+	else if ((p->one->mode & 0777) == 0755 &&
+		 (p->two->mode & 0777) == 0644)
+		return "mode -x";
+	return NULL;
+}
+
 static void builtin_diffstat(const char *name_a, const char *name_b,
 			     struct diff_filespec *one,
 			     struct diff_filespec *two,
@@ -3267,6 +3288,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 
 	data = diffstat_add(diffstat, name_a, name_b);
 	data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
+	if (o->flags.stat_with_summary)
+		data->comments = get_compact_summary(p, data->is_renamed);
 
 	if (!one || !two) {
 		data->is_unmerged = 1;
@@ -3615,7 +3638,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
 	else {
 		enum object_type type;
 		if (size_only || (flags & CHECK_BINARY)) {
-			type = sha1_object_info(s->oid.hash, &s->size);
+			type = oid_object_info(&s->oid, &s->size);
 			if (type < 0)
 				die("unable to read %s",
 				    oid_to_hex(&s->oid));
@@ -3626,7 +3649,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
 				return 0;
 			}
 		}
-		s->data = read_sha1_file(s->oid.hash, &type, &s->size);
+		s->data = read_object_file(&s->oid, &type, &s->size);
 		if (!s->data)
 			die("unable to read %s", oid_to_hex(&s->oid));
 		s->should_free = 1;
@@ -3660,15 +3683,15 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 			   int mode)
 {
 	struct strbuf buf = STRBUF_INIT;
-	struct strbuf template = STRBUF_INIT;
+	struct strbuf tempfile = STRBUF_INIT;
 	char *path_dup = xstrdup(path);
 	const char *base = basename(path_dup);
 
 	/* Generate "XXXXXX_basename.ext" */
-	strbuf_addstr(&template, "XXXXXX_");
-	strbuf_addstr(&template, base);
+	strbuf_addstr(&tempfile, "XXXXXX_");
+	strbuf_addstr(&tempfile, base);
 
-	temp->tempfile = mks_tempfile_ts(template.buf, strlen(base) + 1);
+	temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1);
 	if (!temp->tempfile)
 		die_errno("unable to create temp-file");
 	if (convert_to_working_tree(path,
@@ -3683,7 +3706,7 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 	oid_to_hex_r(temp->hex, oid);
 	xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
 	strbuf_release(&buf);
-	strbuf_release(&template);
+	strbuf_release(&tempfile);
 	free(path_dup);
 }
 
@@ -3811,7 +3834,7 @@ static int similarity_index(struct diff_filepair *p)
 static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
 {
 	if (startup_info->have_repository)
-		return find_unique_abbrev(oid->hash, abbrev);
+		return find_unique_abbrev(oid, abbrev);
 	else {
 		char *hex = oid_to_hex(oid);
 		if (abbrev < 0)
@@ -4553,6 +4576,11 @@ int diff_opt_parse(struct diff_options *options,
 	else if (starts_with(arg, "--stat"))
 		/* --stat, --stat-width, --stat-name-width, or --stat-count */
 		return stat_opt(options, av);
+	else if (!strcmp(arg, "--compact-summary")) {
+		 options->flags.stat_with_summary = 1;
+		 options->output_format |= DIFF_FORMAT_DIFFSTAT;
+	} else if (!strcmp(arg, "--no-compact-summary"))
+		 options->flags.stat_with_summary = 0;
 
 	/* renames options */
 	else if (starts_with(arg, "-B") ||
@@ -5241,10 +5269,12 @@ static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
 		struct diff_filepair *p)
 {
 	struct strbuf sb = STRBUF_INIT;
-	char *names = pprint_rename(p->one->path, p->two->path);
+	struct strbuf names = STRBUF_INIT;
+
+	pprint_rename(&names, p->one->path, p->two->path);
 	strbuf_addf(&sb, " %s %s (%d%%)\n",
-			renamecopy, names, similarity_index(p));
-	free(names);
+		    renamecopy, names.buf, similarity_index(p));
+	strbuf_release(&names);
 	emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
 				 sb.buf, sb.len, 0);
 	show_mode_change(opt, p, 0);
diff --git a/diff.h b/diff.h
index 6bd278a..d29560f 100644
--- a/diff.h
+++ b/diff.h
@@ -93,6 +93,7 @@ struct diff_flags {
 	unsigned dirstat_by_line:1;
 	unsigned funccontext:1;
 	unsigned default_follow_renames:1;
+	unsigned stat_with_summary:1;
 };
 
 static inline void diff_flags_or(struct diff_flags *a,
diff --git a/diffcore-delta.c b/diffcore-delta.c
index ebe70fb..c83d45a 100644
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -48,16 +48,16 @@ struct spanhash_top {
 
 static struct spanhash_top *spanhash_rehash(struct spanhash_top *orig)
 {
-	struct spanhash_top *new;
+	struct spanhash_top *new_spanhash;
 	int i;
 	int osz = 1 << orig->alloc_log2;
 	int sz = osz << 1;
 
-	new = xmalloc(st_add(sizeof(*orig),
+	new_spanhash = xmalloc(st_add(sizeof(*orig),
 			     st_mult(sizeof(struct spanhash), sz)));
-	new->alloc_log2 = orig->alloc_log2 + 1;
-	new->free = INITIAL_FREE(new->alloc_log2);
-	memset(new->data, 0, sizeof(struct spanhash) * sz);
+	new_spanhash->alloc_log2 = orig->alloc_log2 + 1;
+	new_spanhash->free = INITIAL_FREE(new_spanhash->alloc_log2);
+	memset(new_spanhash->data, 0, sizeof(struct spanhash) * sz);
 	for (i = 0; i < osz; i++) {
 		struct spanhash *o = &(orig->data[i]);
 		int bucket;
@@ -65,11 +65,11 @@ static struct spanhash_top *spanhash_rehash(struct spanhash_top *orig)
 			continue;
 		bucket = o->hashval & (sz - 1);
 		while (1) {
-			struct spanhash *h = &(new->data[bucket++]);
+			struct spanhash *h = &(new_spanhash->data[bucket++]);
 			if (!h->cnt) {
 				h->hashval = o->hashval;
 				h->cnt = o->cnt;
-				new->free--;
+				new_spanhash->free--;
 				break;
 			}
 			if (sz <= bucket)
@@ -77,7 +77,7 @@ static struct spanhash_top *spanhash_rehash(struct spanhash_top *orig)
 		}
 	}
 	free(orig);
-	return new;
+	return new_spanhash;
 }
 
 static struct spanhash_top *add_spanhash(struct spanhash_top *top,
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 888a4b0..0b7e498 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -260,8 +260,8 @@ static unsigned int hash_filespec(struct diff_filespec *filespec)
 	if (!filespec->oid_valid) {
 		if (diff_populate_filespec(filespec, 0))
 			return 0;
-		hash_sha1_file(filespec->data, filespec->size, "blob",
-			       filespec->oid.hash);
+		hash_object_file(filespec->data, filespec->size, "blob",
+				 &filespec->oid);
 	}
 	return sha1hash(filespec->oid.hash);
 }
diff --git a/dir.c b/dir.c
index ce6e50d..63a917b 100644
--- a/dir.c
+++ b/dir.c
@@ -231,12 +231,10 @@ int within_depth(const char *name, int namelen,
  *     1 along with { data, size } of the (possibly augmented) buffer
  *       when successful.
  *
- * Optionally updates the given sha1_stat with the given OID (when valid).
+ * Optionally updates the given oid_stat with the given OID (when valid).
  */
-static int do_read_blob(const struct object_id *oid,
-			struct sha1_stat *sha1_stat,
-			size_t *size_out,
-			char **data_out)
+static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
+			size_t *size_out, char **data_out)
 {
 	enum object_type type;
 	unsigned long sz;
@@ -245,15 +243,15 @@ static int do_read_blob(const struct object_id *oid,
 	*size_out = 0;
 	*data_out = NULL;
 
-	data = read_sha1_file(oid->hash, &type, &sz);
+	data = read_object_file(oid, &type, &sz);
 	if (!data || type != OBJ_BLOB) {
 		free(data);
 		return -1;
 	}
 
-	if (sha1_stat) {
-		memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat));
-		hashcpy(sha1_stat->sha1, oid->hash);
+	if (oid_stat) {
+		memset(&oid_stat->stat, 0, sizeof(oid_stat->stat));
+		oidcpy(&oid_stat->oid, oid);
 	}
 
 	if (sz == 0) {
@@ -654,9 +652,8 @@ void add_exclude(const char *string, const char *base,
 
 static int read_skip_worktree_file_from_index(const struct index_state *istate,
 					      const char *path,
-					      size_t *size_out,
-					      char **data_out,
-					      struct sha1_stat *sha1_stat)
+					      size_t *size_out, char **data_out,
+					      struct oid_stat *oid_stat)
 {
 	int pos, len;
 
@@ -667,7 +664,7 @@ static int read_skip_worktree_file_from_index(const struct index_state *istate,
 	if (!ce_skip_worktree(istate->cache[pos]))
 		return -1;
 
-	return do_read_blob(&istate->cache[pos]->oid, sha1_stat, size_out, data_out);
+	return do_read_blob(&istate->cache[pos]->oid, oid_stat, size_out, data_out);
 }
 
 /*
@@ -774,7 +771,16 @@ static void invalidate_directory(struct untracked_cache *uc,
 				 struct untracked_cache_dir *dir)
 {
 	int i;
-	uc->dir_invalidated++;
+
+	/*
+	 * Invalidation increment here is just roughly correct. If
+	 * untracked_nr or any of dirs[].recurse is non-zero, we
+	 * should increment dir_invalidated too. But that's more
+	 * expensive to do.
+	 */
+	if (dir->valid)
+		uc->dir_invalidated++;
+
 	dir->valid = 0;
 	dir->untracked_nr = 0;
 	for (i = 0; i < dir->dirs_nr; i++)
@@ -795,9 +801,8 @@ static int add_excludes_from_buffer(char *buf, size_t size,
  * ss_valid is non-zero, "ss" must contain good value as input.
  */
 static int add_excludes(const char *fname, const char *base, int baselen,
-			struct exclude_list *el,
-			struct index_state *istate,
-			struct sha1_stat *sha1_stat)
+			struct exclude_list *el, struct index_state *istate,
+			struct oid_stat *oid_stat)
 {
 	struct stat st;
 	int r;
@@ -815,16 +820,16 @@ static int add_excludes(const char *fname, const char *base, int baselen,
 			return -1;
 		r = read_skip_worktree_file_from_index(istate, fname,
 						       &size, &buf,
-						       sha1_stat);
+						       oid_stat);
 		if (r != 1)
 			return r;
 	} else {
 		size = xsize_t(st.st_size);
 		if (size == 0) {
-			if (sha1_stat) {
-				fill_stat_data(&sha1_stat->stat, &st);
-				hashcpy(sha1_stat->sha1, EMPTY_BLOB_SHA1_BIN);
-				sha1_stat->valid = 1;
+			if (oid_stat) {
+				fill_stat_data(&oid_stat->stat, &st);
+				oidcpy(&oid_stat->oid, &empty_blob_oid);
+				oid_stat->valid = 1;
 			}
 			close(fd);
 			return 0;
@@ -837,22 +842,23 @@ static int add_excludes(const char *fname, const char *base, int baselen,
 		}
 		buf[size++] = '\n';
 		close(fd);
-		if (sha1_stat) {
+		if (oid_stat) {
 			int pos;
-			if (sha1_stat->valid &&
-			    !match_stat_data_racy(istate, &sha1_stat->stat, &st))
+			if (oid_stat->valid &&
+			    !match_stat_data_racy(istate, &oid_stat->stat, &st))
 				; /* no content change, ss->sha1 still good */
 			else if (istate &&
 				 (pos = index_name_pos(istate, fname, strlen(fname))) >= 0 &&
 				 !ce_stage(istate->cache[pos]) &&
 				 ce_uptodate(istate->cache[pos]) &&
 				 !would_convert_to_git(istate, fname))
-				hashcpy(sha1_stat->sha1,
-					istate->cache[pos]->oid.hash);
+				oidcpy(&oid_stat->oid,
+				       &istate->cache[pos]->oid);
 			else
-				hash_sha1_file(buf, size, "blob", sha1_stat->sha1);
-			fill_stat_data(&sha1_stat->stat, &st);
-			sha1_stat->valid = 1;
+				hash_object_file(buf, size, "blob",
+						 &oid_stat->oid);
+			fill_stat_data(&oid_stat->stat, &st);
+			oid_stat->valid = 1;
 		}
 	}
 
@@ -930,7 +936,7 @@ struct exclude_list *add_exclude_list(struct dir_struct *dir,
  * Used to set up core.excludesfile and .git/info/exclude lists.
  */
 static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
-				     struct sha1_stat *sha1_stat)
+				     struct oid_stat *oid_stat)
 {
 	struct exclude_list *el;
 	/*
@@ -941,7 +947,7 @@ static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
 	if (!dir->untracked)
 		dir->unmanaged_exclude_files++;
 	el = add_exclude_list(dir, EXC_FILE, fname);
-	if (add_excludes(fname, "", 0, el, NULL, sha1_stat) < 0)
+	if (add_excludes(fname, "", 0, el, NULL, oid_stat) < 0)
 		die("cannot use %s as an exclude file", fname);
 }
 
@@ -1180,7 +1186,7 @@ static void prep_exclude(struct dir_struct *dir,
 
 	while (current < baselen) {
 		const char *cp;
-		struct sha1_stat sha1_stat;
+		struct oid_stat oid_stat;
 
 		stk = xcalloc(1, sizeof(*stk));
 		if (current < 0) {
@@ -1223,8 +1229,8 @@ static void prep_exclude(struct dir_struct *dir,
 		}
 
 		/* Try to read per-directory file */
-		hashclr(sha1_stat.sha1);
-		sha1_stat.valid = 0;
+		oidclr(&oid_stat.oid);
+		oid_stat.valid = 0;
 		if (dir->exclude_per_dir &&
 		    /*
 		     * If we know that no files have been added in
@@ -1252,7 +1258,7 @@ static void prep_exclude(struct dir_struct *dir,
 			strbuf_addstr(&sb, dir->exclude_per_dir);
 			el->src = strbuf_detach(&sb, NULL);
 			add_excludes(el->src, el->src, stk->baselen, el, istate,
-				     untracked ? &sha1_stat : NULL);
+				     untracked ? &oid_stat : NULL);
 		}
 		/*
 		 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
@@ -1269,9 +1275,9 @@ static void prep_exclude(struct dir_struct *dir,
 		 * order, though, if you do that.
 		 */
 		if (untracked &&
-		    hashcmp(sha1_stat.sha1, untracked->exclude_sha1)) {
+		    hashcmp(oid_stat.oid.hash, untracked->exclude_sha1)) {
 			invalidate_gitignore(dir->untracked, untracked);
-			hashcpy(untracked->exclude_sha1, sha1_stat.sha1);
+			hashcpy(untracked->exclude_sha1, oid_stat.oid.hash);
 		}
 		dir->exclude_stack = stk;
 		current = stk->baselen;
@@ -1773,7 +1779,7 @@ static enum path_treatment treat_path(struct dir_struct *dir,
 	if (!de)
 		return treat_path_fast(dir, untracked, cdir, istate, path,
 				       baselen, pathspec);
-	if (is_dot_or_dotdot(de->d_name) || !strcmp(de->d_name, ".git"))
+	if (is_dot_or_dotdot(de->d_name) || !fspathcmp(de->d_name, ".git"))
 		return path_none;
 	strbuf_setlen(path, baselen);
 	strbuf_addstr(path, de->d_name);
@@ -1809,24 +1815,19 @@ static int valid_cached_dir(struct dir_struct *dir,
 	 */
 	refresh_fsmonitor(istate);
 	if (!(dir->untracked->use_fsmonitor && untracked->valid)) {
-		if (stat(path->len ? path->buf : ".", &st)) {
-			invalidate_directory(dir->untracked, untracked);
+		if (lstat(path->len ? path->buf : ".", &st)) {
 			memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
 			return 0;
 		}
 		if (!untracked->valid ||
 			match_stat_data_racy(istate, &untracked->stat_data, &st)) {
-			if (untracked->valid)
-				invalidate_directory(dir->untracked, untracked);
 			fill_stat_data(&untracked->stat_data, &st);
 			return 0;
 		}
 	}
 
-	if (untracked->check_only != !!check_only) {
-		invalidate_directory(dir->untracked, untracked);
+	if (untracked->check_only != !!check_only)
 		return 0;
-	}
 
 	/*
 	 * prep_exclude will be called eventually on this directory,
@@ -1853,13 +1854,20 @@ static int open_cached_dir(struct cached_dir *cdir,
 			   struct strbuf *path,
 			   int check_only)
 {
+	const char *c_path;
+
 	memset(cdir, 0, sizeof(*cdir));
 	cdir->untracked = untracked;
 	if (valid_cached_dir(dir, untracked, istate, path, check_only))
 		return 0;
-	cdir->fdir = opendir(path->len ? path->buf : ".");
-	if (dir->untracked)
+	c_path = path->len ? path->buf : ".";
+	cdir->fdir = opendir(c_path);
+	if (!cdir->fdir)
+		warning_errno(_("could not open directory '%s'"), c_path);
+	if (dir->untracked) {
+		invalidate_directory(dir->untracked, untracked);
 		dir->untracked->dir_opened++;
+	}
 	if (!cdir->fdir)
 		return -1;
 	return 0;
@@ -2164,8 +2172,13 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
 						      const struct pathspec *pathspec)
 {
 	struct untracked_cache_dir *root;
+	static int untracked_cache_disabled = -1;
 
-	if (!dir->untracked || getenv("GIT_DISABLE_UNTRACKED_CACHE"))
+	if (!dir->untracked)
+		return NULL;
+	if (untracked_cache_disabled < 0)
+		untracked_cache_disabled = git_env_bool("GIT_DISABLE_UNTRACKED_CACHE", 0);
+	if (untracked_cache_disabled)
 		return NULL;
 
 	/*
@@ -2228,13 +2241,13 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
 
 	/* Validate $GIT_DIR/info/exclude and core.excludesfile */
 	root = dir->untracked->root;
-	if (hashcmp(dir->ss_info_exclude.sha1,
-		    dir->untracked->ss_info_exclude.sha1)) {
+	if (oidcmp(&dir->ss_info_exclude.oid,
+		   &dir->untracked->ss_info_exclude.oid)) {
 		invalidate_gitignore(dir->untracked, root);
 		dir->untracked->ss_info_exclude = dir->ss_info_exclude;
 	}
-	if (hashcmp(dir->ss_excludes_file.sha1,
-		    dir->untracked->ss_excludes_file.sha1)) {
+	if (oidcmp(&dir->ss_excludes_file.oid,
+		   &dir->untracked->ss_excludes_file.oid)) {
 		invalidate_gitignore(dir->untracked, root);
 		dir->untracked->ss_excludes_file = dir->ss_excludes_file;
 	}
@@ -2248,6 +2261,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
 		   const char *path, int len, const struct pathspec *pathspec)
 {
 	struct untracked_cache_dir *untracked;
+	uint64_t start = getnanotime();
 
 	if (has_symlink_leading_path(path, len))
 		return dir->nr;
@@ -2286,8 +2300,14 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
 		dir->nr = i;
 	}
 
+	trace_performance_since(start, "read directory %.*s", len, path);
 	if (dir->untracked) {
+		static int force_untracked_cache = -1;
 		static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS);
+
+		if (force_untracked_cache < 0)
+			force_untracked_cache =
+				git_env_bool("GIT_FORCE_UNTRACKED_CACHE", 0);
 		trace_printf_key(&trace_untracked_stats,
 				 "node creation: %u\n"
 				 "gitignore invalidation: %u\n"
@@ -2297,7 +2317,8 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
 				 dir->untracked->gitignore_invalidated,
 				 dir->untracked->dir_invalidated,
 				 dir->untracked->dir_opened);
-		if (dir->untracked == istate->untracked &&
+		if (force_untracked_cache &&
+			dir->untracked == istate->untracked &&
 		    (dir->untracked->dir_opened ||
 		     dir->untracked->gitignore_invalidated ||
 		     dir->untracked->dir_invalidated))
@@ -2638,8 +2659,8 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
 	FLEX_ALLOC_MEM(ouc, exclude_per_dir, untracked->exclude_per_dir, len);
 	stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
 	stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
-	hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.sha1);
-	hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.sha1);
+	hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.oid.hash);
+	hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.oid.hash);
 	ouc->dir_flags = htonl(untracked->dir_flags);
 
 	varint_len = encode_varint(untracked->ident.len, varbuf);
@@ -2816,13 +2837,12 @@ static void read_sha1(size_t pos, void *cb)
 	rd->data += 20;
 }
 
-static void load_sha1_stat(struct sha1_stat *sha1_stat,
-			   const unsigned char *data,
-			   const unsigned char *sha1)
+static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data,
+			  const unsigned char *sha1)
 {
-	stat_data_from_disk(&sha1_stat->stat, data);
-	hashcpy(sha1_stat->sha1, sha1);
-	sha1_stat->valid = 1;
+	stat_data_from_disk(&oid_stat->stat, data);
+	hashcpy(oid_stat->oid.hash, sha1);
+	oid_stat->valid = 1;
 }
 
 struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz)
@@ -2850,12 +2870,12 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
 	uc = xcalloc(1, sizeof(*uc));
 	strbuf_init(&uc->ident, ident_len);
 	strbuf_add(&uc->ident, ident, ident_len);
-	load_sha1_stat(&uc->ss_info_exclude,
-		       next + ouc_offset(info_exclude_stat),
-		       next + ouc_offset(info_exclude_sha1));
-	load_sha1_stat(&uc->ss_excludes_file,
-		       next + ouc_offset(excludes_file_stat),
-		       next + ouc_offset(excludes_file_sha1));
+	load_oid_stat(&uc->ss_info_exclude,
+		      next + ouc_offset(info_exclude_stat),
+		      next + ouc_offset(info_exclude_sha1));
+	load_oid_stat(&uc->ss_excludes_file,
+		      next + ouc_offset(excludes_file_stat),
+		      next + ouc_offset(excludes_file_sha1));
 	uc->dir_flags = get_be32(next + ouc_offset(dir_flags));
 	exclude_per_dir = (const char *)next + ouc_offset(exclude_per_dir);
 	uc->exclude_per_dir = xstrdup(exclude_per_dir);
@@ -2968,10 +2988,12 @@ static int invalidate_one_component(struct untracked_cache *uc,
 }
 
 void untracked_cache_invalidate_path(struct index_state *istate,
-				     const char *path)
+				     const char *path, int safe_path)
 {
 	if (!istate->untracked || !istate->untracked->root)
 		return;
+	if (!safe_path && !verify_path(path))
+		return;
 	invalidate_one_component(istate->untracked, istate->untracked->root,
 				 path, strlen(path));
 }
@@ -2979,13 +3001,13 @@ void untracked_cache_invalidate_path(struct index_state *istate,
 void untracked_cache_remove_from_index(struct index_state *istate,
 				       const char *path)
 {
-	untracked_cache_invalidate_path(istate, path);
+	untracked_cache_invalidate_path(istate, path, 1);
 }
 
 void untracked_cache_add_to_index(struct index_state *istate,
 				  const char *path)
 {
-	untracked_cache_invalidate_path(istate, path);
+	untracked_cache_invalidate_path(istate, path, 1);
 }
 
 /* Update gitfile and core.worktree setting to connect work tree and git dir */
diff --git a/dir.h b/dir.h
index 11a047b..b0758b8 100644
--- a/dir.h
+++ b/dir.h
@@ -74,9 +74,9 @@ struct exclude_list_group {
 	struct exclude_list *el;
 };
 
-struct sha1_stat {
+struct oid_stat {
 	struct stat_data stat;
-	unsigned char sha1[20];
+	struct object_id oid;
 	int valid;
 };
 
@@ -124,8 +124,8 @@ struct untracked_cache_dir {
 };
 
 struct untracked_cache {
-	struct sha1_stat ss_info_exclude;
-	struct sha1_stat ss_excludes_file;
+	struct oid_stat ss_info_exclude;
+	struct oid_stat ss_excludes_file;
 	const char *exclude_per_dir;
 	struct strbuf ident;
 	/*
@@ -195,8 +195,8 @@ struct dir_struct {
 
 	/* Enable untracked file cache if set */
 	struct untracked_cache *untracked;
-	struct sha1_stat ss_info_exclude;
-	struct sha1_stat ss_excludes_file;
+	struct oid_stat ss_info_exclude;
+	struct oid_stat ss_excludes_file;
 	unsigned unmanaged_exclude_files;
 };
 
@@ -350,7 +350,7 @@ static inline int dir_path_match(const struct dir_entry *ent,
 int cmp_dir_entry(const void *p1, const void *p2);
 int check_dir_entry_contains(const struct dir_entry *out, const struct dir_entry *in);
 
-void untracked_cache_invalidate_path(struct index_state *, const char *);
+void untracked_cache_invalidate_path(struct index_state *, const char *, int safe_path);
 void untracked_cache_remove_from_index(struct index_state *, const char *);
 void untracked_cache_add_to_index(struct index_state *, const char *);
 
diff --git a/entry.c b/entry.c
index 3021144..2101201 100644
--- a/entry.c
+++ b/entry.c
@@ -85,12 +85,12 @@ static int create_file(const char *path, unsigned int mode)
 static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
 {
 	enum object_type type;
-	void *new = read_sha1_file(ce->oid.hash, &type, size);
+	void *blob_data = read_object_file(&ce->oid, &type, size);
 
-	if (new) {
+	if (blob_data) {
 		if (type == OBJ_BLOB)
-			return new;
-		free(new);
+			return blob_data;
+		free(blob_data);
 	}
 	return NULL;
 }
@@ -256,7 +256,7 @@ static int write_entry(struct cache_entry *ce,
 	unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
 	struct delayed_checkout *dco = state->delayed_checkout;
 	int fd, ret, fstat_done = 0;
-	char *new;
+	char *new_blob;
 	struct strbuf buf = STRBUF_INIT;
 	unsigned long size;
 	ssize_t wrote;
@@ -266,7 +266,7 @@ static int write_entry(struct cache_entry *ce,
 
 	if (ce_mode_s_ifmt == S_IFREG) {
 		struct stream_filter *filter = get_stream_filter(ce->name,
-								 ce->oid.hash);
+								 &ce->oid);
 		if (filter &&
 		    !streaming_write_entry(ce, path, filter,
 					   state, to_tempfile,
@@ -276,8 +276,8 @@ static int write_entry(struct cache_entry *ce,
 
 	switch (ce_mode_s_ifmt) {
 	case S_IFLNK:
-		new = read_blob_entry(ce, &size);
-		if (!new)
+		new_blob = read_blob_entry(ce, &size);
+		if (!new_blob)
 			return error("unable to read sha1 file of %s (%s)",
 				     path, oid_to_hex(&ce->oid));
 
@@ -288,8 +288,8 @@ static int write_entry(struct cache_entry *ce,
 		if (!has_symlinks || to_tempfile)
 			goto write_file_entry;
 
-		ret = symlink(new, path);
-		free(new);
+		ret = symlink(new_blob, path);
+		free(new_blob);
 		if (ret)
 			return error_errno("unable to create symlink %s", path);
 		break;
@@ -300,11 +300,11 @@ static int write_entry(struct cache_entry *ce,
 		 * bother reading it at all.
 		 */
 		if (dco && dco->state == CE_RETRY) {
-			new = NULL;
+			new_blob = NULL;
 			size = 0;
 		} else {
-			new = read_blob_entry(ce, &size);
-			if (!new)
+			new_blob = read_blob_entry(ce, &size);
+			if (!new_blob)
 				return error("unable to read sha1 file of %s (%s)",
 					     path, oid_to_hex(&ce->oid));
 		}
@@ -313,18 +313,18 @@ static int write_entry(struct cache_entry *ce,
 		 * Convert from git internal format to working tree format
 		 */
 		if (dco && dco->state != CE_NO_DELAY) {
-			ret = async_convert_to_working_tree(ce->name, new,
+			ret = async_convert_to_working_tree(ce->name, new_blob,
 							    size, &buf, dco);
 			if (ret && string_list_has_string(&dco->paths, ce->name)) {
-				free(new);
+				free(new_blob);
 				goto delayed;
 			}
 		} else
-			ret = convert_to_working_tree(ce->name, new, size, &buf);
+			ret = convert_to_working_tree(ce->name, new_blob, size, &buf);
 
 		if (ret) {
-			free(new);
-			new = strbuf_detach(&buf, &newsize);
+			free(new_blob);
+			new_blob = strbuf_detach(&buf, &newsize);
 			size = newsize;
 		}
 		/*
@@ -336,15 +336,15 @@ static int write_entry(struct cache_entry *ce,
 	write_file_entry:
 		fd = open_output_fd(path, ce, to_tempfile);
 		if (fd < 0) {
-			free(new);
+			free(new_blob);
 			return error_errno("unable to create file %s", path);
 		}
 
-		wrote = write_in_full(fd, new, size);
+		wrote = write_in_full(fd, new_blob, size);
 		if (!to_tempfile)
 			fstat_done = fstat_output(fd, state, &st);
 		close(fd);
-		free(new);
+		free(new_blob);
 		if (wrote < 0)
 			return error("unable to write file %s", path);
 		break;
diff --git a/environment.c b/environment.c
index 93c9fbb..39b3d90 100644
--- a/environment.c
+++ b/environment.c
@@ -102,7 +102,7 @@ int ignore_untracked_cache_config;
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;
 
-static char *namespace;
+static char *git_namespace;
 
 static const char *super_prefix;
 
@@ -185,8 +185,8 @@ void setup_git_env(const char *git_dir)
 	free(git_replace_ref_base);
 	git_replace_ref_base = xstrdup(replace_ref_base ? replace_ref_base
 							  : "refs/replace/");
-	free(namespace);
-	namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
+	free(git_namespace);
+	git_namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
 	shallow_file = getenv(GIT_SHALLOW_FILE_ENVIRONMENT);
 	if (shallow_file)
 		set_alternate_shallow_file(shallow_file, 0);
@@ -220,9 +220,9 @@ const char *get_git_common_dir(void)
 
 const char *get_git_namespace(void)
 {
-	if (!namespace)
+	if (!git_namespace)
 		BUG("git environment hasn't been setup");
-	return namespace;
+	return git_namespace;
 }
 
 const char *strip_namespace(const char *namespaced_ref)
@@ -276,7 +276,7 @@ char *get_object_directory(void)
 	return the_repository->objects->objectdir;
 }
 
-int odb_mkstemp(struct strbuf *template, const char *pattern)
+int odb_mkstemp(struct strbuf *temp_filename, const char *pattern)
 {
 	int fd;
 	/*
@@ -284,16 +284,16 @@ int odb_mkstemp(struct strbuf *template, const char *pattern)
 	 * restrictive except to remove write permission.
 	 */
 	int mode = 0444;
-	git_path_buf(template, "objects/%s", pattern);
-	fd = git_mkstemp_mode(template->buf, mode);
+	git_path_buf(temp_filename, "objects/%s", pattern);
+	fd = git_mkstemp_mode(temp_filename->buf, mode);
 	if (0 <= fd)
 		return fd;
 
 	/* slow path */
-	/* some mkstemp implementations erase template on failure */
-	git_path_buf(template, "objects/%s", pattern);
-	safe_create_leading_directories(template->buf);
-	return xmkstemp_mode(template->buf, mode);
+	/* some mkstemp implementations erase temp_filename on failure */
+	git_path_buf(temp_filename, "objects/%s", pattern);
+	safe_create_leading_directories(temp_filename->buf);
+	return xmkstemp_mode(temp_filename->buf, mode);
 }
 
 int odb_pack_keep(const char *name)
diff --git a/fast-import.c b/fast-import.c
index b3492fc..b2f6d6d 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -318,7 +318,7 @@ static struct atom_str **atom_table;
 /* The .pack file being generated */
 static struct pack_idx_option pack_idx_opts;
 static unsigned int pack_id;
-static struct sha1file *pack_file;
+static struct hashfile *pack_file;
 static struct packed_git *pack_data;
 static struct packed_git **all_packs;
 static off_t pack_size;
@@ -907,12 +907,12 @@ static void start_packfile(void)
 
 	p->pack_fd = pack_fd;
 	p->do_not_close = 1;
-	pack_file = sha1fd(pack_fd, p->pack_name);
+	pack_file = hashfd(pack_fd, p->pack_name);
 
 	hdr.hdr_signature = htonl(PACK_SIGNATURE);
 	hdr.hdr_version = htonl(2);
 	hdr.hdr_entries = 0;
-	sha1write(pack_file, &hdr, sizeof(hdr));
+	hashwrite(pack_file, &hdr, sizeof(hdr));
 
 	pack_data = p;
 	pack_size = sizeof(hdr);
@@ -1018,7 +1018,7 @@ static void end_packfile(void)
 		struct tag *t;
 
 		close_pack_windows(pack_data);
-		sha1close(pack_file, cur_pack_oid.hash, 0);
+		hashclose(pack_file, cur_pack_oid.hash, 0);
 		fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
 				    pack_data->pack_name, object_count,
 				    cur_pack_oid.hash, pack_size);
@@ -1094,15 +1094,15 @@ static int store_object(
 	unsigned char hdr[96];
 	struct object_id oid;
 	unsigned long hdrlen, deltalen;
-	git_SHA_CTX c;
+	git_hash_ctx c;
 	git_zstream s;
 
 	hdrlen = xsnprintf((char *)hdr, sizeof(hdr), "%s %lu",
-			   typename(type), (unsigned long)dat->len) + 1;
-	git_SHA1_Init(&c);
-	git_SHA1_Update(&c, hdr, hdrlen);
-	git_SHA1_Update(&c, dat->buf, dat->len);
-	git_SHA1_Final(oid.hash, &c);
+			   type_name(type), (unsigned long)dat->len) + 1;
+	the_hash_algo->init_fn(&c);
+	the_hash_algo->update_fn(&c, hdr, hdrlen);
+	the_hash_algo->update_fn(&c, dat->buf, dat->len);
+	the_hash_algo->final_fn(oid.hash, &c);
 	if (oidout)
 		oidcpy(oidout, &oid);
 
@@ -1121,11 +1121,13 @@ static int store_object(
 		return 1;
 	}
 
-	if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
+	if (last && last->data.buf && last->depth < max_depth
+		&& dat->len > the_hash_algo->rawsz) {
+
 		delta_count_attempts_by_type[type]++;
 		delta = diff_delta(last->data.buf, last->data.len,
 			dat->buf, dat->len,
-			&deltalen, dat->len - 20);
+			&deltalen, dat->len - the_hash_algo->rawsz);
 	} else
 		delta = NULL;
 
@@ -1183,23 +1185,23 @@ static int store_object(
 
 		hdrlen = encode_in_pack_object_header(hdr, sizeof(hdr),
 						      OBJ_OFS_DELTA, deltalen);
-		sha1write(pack_file, hdr, hdrlen);
+		hashwrite(pack_file, hdr, hdrlen);
 		pack_size += hdrlen;
 
 		hdr[pos] = ofs & 127;
 		while (ofs >>= 7)
 			hdr[--pos] = 128 | (--ofs & 127);
-		sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
+		hashwrite(pack_file, hdr + pos, sizeof(hdr) - pos);
 		pack_size += sizeof(hdr) - pos;
 	} else {
 		e->depth = 0;
 		hdrlen = encode_in_pack_object_header(hdr, sizeof(hdr),
 						      type, dat->len);
-		sha1write(pack_file, hdr, hdrlen);
+		hashwrite(pack_file, hdr, hdrlen);
 		pack_size += hdrlen;
 	}
 
-	sha1write(pack_file, out, s.total_out);
+	hashwrite(pack_file, out, s.total_out);
 	pack_size += s.total_out;
 
 	e->idx.crc32 = crc32_end(pack_file);
@@ -1218,9 +1220,9 @@ static int store_object(
 	return 0;
 }
 
-static void truncate_pack(struct sha1file_checkpoint *checkpoint)
+static void truncate_pack(struct hashfile_checkpoint *checkpoint)
 {
-	if (sha1file_truncate(pack_file, checkpoint))
+	if (hashfile_truncate(pack_file, checkpoint))
 		die_errno("cannot truncate pack to skip duplicate");
 	pack_size = checkpoint->offset;
 }
@@ -1234,9 +1236,9 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 	struct object_id oid;
 	unsigned long hdrlen;
 	off_t offset;
-	git_SHA_CTX c;
+	git_hash_ctx c;
 	git_zstream s;
-	struct sha1file_checkpoint checkpoint;
+	struct hashfile_checkpoint checkpoint;
 	int status = Z_OK;
 
 	/* Determine if we should auto-checkpoint. */
@@ -1244,13 +1246,13 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 		|| (pack_size + 60 + len) < pack_size)
 		cycle_packfile();
 
-	sha1file_checkpoint(pack_file, &checkpoint);
+	hashfile_checkpoint(pack_file, &checkpoint);
 	offset = checkpoint.offset;
 
 	hdrlen = xsnprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
 
-	git_SHA1_Init(&c);
-	git_SHA1_Update(&c, out_buf, hdrlen);
+	the_hash_algo->init_fn(&c);
+	the_hash_algo->update_fn(&c, out_buf, hdrlen);
 
 	crc32_begin(pack_file);
 
@@ -1268,7 +1270,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 			if (!n && feof(stdin))
 				die("EOF in data (%" PRIuMAX " bytes remaining)", len);
 
-			git_SHA1_Update(&c, in_buf, n);
+			the_hash_algo->update_fn(&c, in_buf, n);
 			s.next_in = in_buf;
 			s.avail_in = n;
 			len -= n;
@@ -1278,7 +1280,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 
 		if (!s.avail_out || status == Z_STREAM_END) {
 			size_t n = s.next_out - out_buf;
-			sha1write(pack_file, out_buf, n);
+			hashwrite(pack_file, out_buf, n);
 			pack_size += n;
 			s.next_out = out_buf;
 			s.avail_out = out_sz;
@@ -1294,7 +1296,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 		}
 	}
 	git_deflate_end(&s);
-	git_SHA1_Final(oid.hash, &c);
+	the_hash_algo->final_fn(oid.hash, &c);
 
 	if (oidout)
 		oidcpy(oidout, &oid);
@@ -1354,25 +1356,25 @@ static void *gfi_unpack_entry(
 {
 	enum object_type type;
 	struct packed_git *p = all_packs[oe->pack_id];
-	if (p == pack_data && p->pack_size < (pack_size + 20)) {
+	if (p == pack_data && p->pack_size < (pack_size + the_hash_algo->rawsz)) {
 		/* The object is stored in the packfile we are writing to
 		 * and we have modified it since the last time we scanned
 		 * back to read a previously written object.  If an old
-		 * window covered [p->pack_size, p->pack_size + 20) its
+		 * window covered [p->pack_size, p->pack_size + rawsz) its
 		 * data is stale and is not valid.  Closing all windows
 		 * and updating the packfile length ensures we can read
 		 * the newly written data.
 		 */
 		close_pack_windows(p);
-		sha1flush(pack_file);
+		hashflush(pack_file);
 
-		/* We have to offer 20 bytes additional on the end of
+		/* We have to offer rawsz bytes additional on the end of
 		 * the packfile as the core unpacker code assumes the
 		 * footer is present at the file end and must promise
-		 * at least 20 bytes within any window it maps.  But
+		 * at least rawsz bytes within any window it maps.  But
 		 * we don't actually create the footer here.
 		 */
-		p->pack_size = pack_size + 20;
+		p->pack_size = pack_size + the_hash_algo->rawsz;
 	}
 	return unpack_entry(p, oe->idx.offset, &type, sizep);
 }
@@ -1414,7 +1416,7 @@ static void load_tree(struct tree_entry *root)
 			die("Can't load tree %s", oid_to_hex(oid));
 	} else {
 		enum object_type type;
-		buf = read_sha1_file(oid->hash, &type, &size);
+		buf = read_object_file(oid, &type, &size);
 		if (!buf || type != OBJ_TREE)
 			die("Can't load tree %s", oid_to_hex(oid));
 	}
@@ -1915,7 +1917,7 @@ static void read_marks(void)
 			die("corrupt mark line: %s", line);
 		e = find_object(&oid);
 		if (!e) {
-			enum object_type type = sha1_object_info(oid.hash, NULL);
+			enum object_type type = oid_object_info(&oid, NULL);
 			if (type < 0)
 				die("object not found: %s", oid_to_hex(&oid));
 			e = insert_object(&oid);
@@ -2208,7 +2210,7 @@ static void construct_path_with_fanout(const char *hex_sha1,
 		unsigned char fanout, char *path)
 {
 	unsigned int i = 0, j = 0;
-	if (fanout >= 20)
+	if (fanout >= the_hash_algo->rawsz)
 		die("Too large fanout (%u)", fanout);
 	while (fanout) {
 		path[i++] = hex_sha1[j++];
@@ -2216,8 +2218,8 @@ static void construct_path_with_fanout(const char *hex_sha1,
 		path[i++] = '/';
 		fanout--;
 	}
-	memcpy(path + i, hex_sha1 + j, GIT_SHA1_HEXSZ - j);
-	path[i + GIT_SHA1_HEXSZ - j] = '\0';
+	memcpy(path + i, hex_sha1 + j, the_hash_algo->hexsz - j);
+	path[i + the_hash_algo->hexsz - j] = '\0';
 }
 
 static uintmax_t do_change_note_fanout(
@@ -2425,7 +2427,7 @@ static void file_change_m(const char *p, struct branch *b)
 		else if (oe) {
 			if (oe->type != OBJ_COMMIT)
 				die("Not a commit (actually a %s): %s",
-					typename(oe->type), command_buf.buf);
+					type_name(oe->type), command_buf.buf);
 		}
 		/*
 		 * Accept the sha1 without checking; it expected to be in
@@ -2445,14 +2447,14 @@ static void file_change_m(const char *p, struct branch *b)
 		enum object_type expected = S_ISDIR(mode) ?
 						OBJ_TREE: OBJ_BLOB;
 		enum object_type type = oe ? oe->type :
-					sha1_object_info(oid.hash, NULL);
+					oid_object_info(&oid, NULL);
 		if (type < 0)
 			die("%s not found: %s",
 					S_ISDIR(mode) ?  "Tree" : "Blob",
 					command_buf.buf);
 		if (type != expected)
 			die("Not a %s (actually a %s): %s",
-				typename(expected), typename(type),
+				type_name(expected), type_name(type),
 				command_buf.buf);
 	}
 
@@ -2585,8 +2587,9 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
 		oidcpy(&commit_oid, &commit_oe->idx.oid);
 	} else if (!get_oid(p, &commit_oid)) {
 		unsigned long size;
-		char *buf = read_object_with_reference(commit_oid.hash,
-			commit_type, &size, commit_oid.hash);
+		char *buf = read_object_with_reference(&commit_oid,
+						       commit_type, &size,
+						       &commit_oid);
 		if (!buf || size < 46)
 			die("Not a valid commit: %s", p);
 		free(buf);
@@ -2603,14 +2606,14 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
 	} else if (oe) {
 		if (oe->type != OBJ_BLOB)
 			die("Not a blob (actually a %s): %s",
-				typename(oe->type), command_buf.buf);
+				type_name(oe->type), command_buf.buf);
 	} else if (!is_null_oid(&oid)) {
-		enum object_type type = sha1_object_info(oid.hash, NULL);
+		enum object_type type = oid_object_info(&oid, NULL);
 		if (type < 0)
 			die("Blob not found: %s", command_buf.buf);
 		if (type != OBJ_BLOB)
 			die("Not a blob (actually a %s): %s",
-			    typename(type), command_buf.buf);
+			    type_name(type), command_buf.buf);
 	}
 
 	construct_path_with_fanout(oid_to_hex(&commit_oid), *old_fanout, path);
@@ -2655,9 +2658,8 @@ static void parse_from_existing(struct branch *b)
 		unsigned long size;
 		char *buf;
 
-		buf = read_object_with_reference(b->oid.hash,
-						 commit_type, &size,
-						 b->oid.hash);
+		buf = read_object_with_reference(&b->oid, commit_type, &size,
+						 &b->oid);
 		parse_from_commit(b, buf, size);
 		free(buf);
 	}
@@ -2734,8 +2736,9 @@ static struct hash_list *parse_merge(unsigned int *count)
 			oidcpy(&n->oid, &oe->idx.oid);
 		} else if (!get_oid(from, &n->oid)) {
 			unsigned long size;
-			char *buf = read_object_with_reference(n->oid.hash,
-				commit_type, &size, n->oid.hash);
+			char *buf = read_object_with_reference(&n->oid,
+							       commit_type,
+							       &size, &n->oid);
 			if (!buf || size < 46)
 				die("Not a valid commit: %s", from);
 			free(buf);
@@ -2892,7 +2895,7 @@ static void parse_new_tag(const char *arg)
 	} else if (!get_oid(from, &oid)) {
 		struct object_entry *oe = find_object(&oid);
 		if (!oe) {
-			type = sha1_object_info(oid.hash, NULL);
+			type = oid_object_info(&oid, NULL);
 			if (type < 0)
 				die("Not a valid object: %s", from);
 		} else
@@ -2918,7 +2921,7 @@ static void parse_new_tag(const char *arg)
 		    "object %s\n"
 		    "type %s\n"
 		    "tag %s\n",
-		    oid_to_hex(&oid), typename(type), t->name);
+		    oid_to_hex(&oid), type_name(type), t->name);
 	if (tagger)
 		strbuf_addf(&new_data,
 			    "tagger %s\n", tagger);
@@ -2968,7 +2971,7 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
 	char *buf;
 
 	if (!oe || oe->pack_id == MAX_PACK_ID) {
-		buf = read_sha1_file(oid->hash, &type, &size);
+		buf = read_object_file(oid, &type, &size);
 	} else {
 		type = oe->type;
 		buf = gfi_unpack_entry(oe, &size);
@@ -2989,10 +2992,10 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
 		die("Can't read object %s", oid_to_hex(oid));
 	if (type != OBJ_BLOB)
 		die("Object %s is a %s but a blob was expected.",
-		    oid_to_hex(oid), typename(type));
+		    oid_to_hex(oid), type_name(type));
 	strbuf_reset(&line);
 	strbuf_addf(&line, "%s %s %lu\n", oid_to_hex(oid),
-						typename(type), size);
+						type_name(type), size);
 	cat_blob_write(line.buf, line.len);
 	strbuf_release(&line);
 	cat_blob_write(buf, size);
@@ -3007,7 +3010,7 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
 
 static void parse_get_mark(const char *p)
 {
-	struct object_entry *oe = oe;
+	struct object_entry *oe;
 	char output[GIT_MAX_HEXSZ + 2];
 
 	/* get-mark SP <object> LF */
@@ -3024,7 +3027,7 @@ static void parse_get_mark(const char *p)
 
 static void parse_cat_blob(const char *p)
 {
-	struct object_entry *oe = oe;
+	struct object_entry *oe;
 	struct object_id oid;
 
 	/* cat-blob SP <object> LF */
@@ -3050,7 +3053,7 @@ static struct object_entry *dereference(struct object_entry *oe,
 	unsigned long size;
 	char *buf = NULL;
 	if (!oe) {
-		enum object_type type = sha1_object_info(oid->hash, NULL);
+		enum object_type type = oid_object_info(oid, NULL);
 		if (type < 0)
 			die("object not found: %s", oid_to_hex(oid));
 		/* cache it! */
@@ -3073,7 +3076,7 @@ static struct object_entry *dereference(struct object_entry *oe,
 		buf = gfi_unpack_entry(oe, &size);
 	} else {
 		enum object_type unused;
-		buf = read_sha1_file(oid->hash, &unused, &size);
+		buf = read_object_file(oid, &unused, &size);
 	}
 	if (!buf)
 		die("Can't load object %s", oid_to_hex(oid));
diff --git a/fetch-pack.c b/fetch-pack.c
index 8253d74..52932b3 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -261,8 +261,8 @@ static enum ack_type get_ack(int fd, struct object_id *result_oid)
 	char *line = packet_read_line(fd, &len);
 	const char *arg;
 
-	if (!len)
-		die(_("git fetch-pack: expected ACK/NAK, got EOF"));
+	if (!line)
+		die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
 	if (!strcmp(line, "NAK"))
 		return NAK;
 	if (skip_prefix(line, "ACK ", &arg)) {
@@ -711,6 +711,28 @@ static void mark_alternate_complete(struct object *obj)
 	mark_complete(&obj->oid);
 }
 
+struct loose_object_iter {
+	struct oidset *loose_object_set;
+	struct ref *refs;
+};
+
+/*
+ *  If the number of refs is not larger than the number of loose objects,
+ *  this function stops inserting.
+ */
+static int add_loose_objects_to_set(const struct object_id *oid,
+				    const char *path,
+				    void *data)
+{
+	struct loose_object_iter *iter = data;
+	oidset_insert(iter->loose_object_set, oid);
+	if (iter->refs == NULL)
+		return 1;
+
+	iter->refs = iter->refs->next;
+	return 0;
+}
+
 static int everything_local(struct fetch_pack_args *args,
 			    struct ref **refs,
 			    struct ref **sought, int nr_sought)
@@ -719,16 +741,31 @@ static int everything_local(struct fetch_pack_args *args,
 	int retval;
 	int old_save_commit_buffer = save_commit_buffer;
 	timestamp_t cutoff = 0;
+	struct oidset loose_oid_set = OIDSET_INIT;
+	int use_oidset = 0;
+	struct loose_object_iter iter = {&loose_oid_set, *refs};
+
+	/* Enumerate all loose objects or know refs are not so many. */
+	use_oidset = !for_each_loose_object(add_loose_objects_to_set,
+					    &iter, 0);
 
 	save_commit_buffer = 0;
 
 	for (ref = *refs; ref; ref = ref->next) {
 		struct object *o;
+		unsigned int flags = OBJECT_INFO_QUICK;
 
-		if (!has_object_file_with_flags(&ref->old_oid,
-						OBJECT_INFO_QUICK))
-			continue;
+		if (use_oidset &&
+		    !oidset_contains(&loose_oid_set, &ref->old_oid)) {
+			/*
+			 * I know this does not exist in the loose form,
+			 * so check if it exists in a non-loose form.
+			 */
+			flags |= OBJECT_INFO_IGNORE_LOOSE;
+		}
 
+		if (!has_object_file_with_flags(&ref->old_oid, flags))
+			continue;
 		o = parse_object(&ref->old_oid);
 		if (!o)
 			continue;
@@ -744,6 +781,8 @@ static int everything_local(struct fetch_pack_args *args,
 		}
 	}
 
+	oidset_clear(&loose_oid_set);
+
 	if (!args->no_dependents) {
 		if (!args->deepen) {
 			for_each_ref(mark_complete_oid, NULL);
@@ -886,8 +925,17 @@ static int get_pack(struct fetch_pack_args *args,
 	    ? fetch_fsck_objects
 	    : transfer_fsck_objects >= 0
 	    ? transfer_fsck_objects
-	    : 0)
-		argv_array_push(&cmd.args, "--strict");
+	    : 0) {
+		if (args->from_promisor)
+			/*
+			 * We cannot use --strict in index-pack because it
+			 * checks both broken objects and links, but we only
+			 * want to check for broken objects.
+			 */
+			argv_array_push(&cmd.args, "--fsck-objects");
+		else
+			argv_array_push(&cmd.args, "--strict");
+	}
 
 	cmd.in = demux.out;
 	cmd.git_cmd = 1;
diff --git a/fsck.c b/fsck.c
index 032699e..9218c2a 100644
--- a/fsck.c
+++ b/fsck.c
@@ -811,7 +811,7 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
 		enum object_type type;
 
 		buffer = to_free =
-			read_sha1_file(tag->object.oid.hash, &type, &size);
+			read_object_file(&tag->object.oid, &type, &size);
 		if (!buffer)
 			return report(options, &tag->object,
 				FSCK_MSG_MISSING_TAG_OBJECT,
@@ -821,7 +821,7 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
 			ret = report(options, &tag->object,
 				FSCK_MSG_TAG_OBJECT_NOT_TAG,
 				"expected tag got %s",
-			    typename(type));
+			    type_name(type));
 			goto done;
 		}
 	}
diff --git a/fsmonitor.c b/fsmonitor.c
index 0af7c4e..6d7bcd5 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -130,7 +130,7 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n
 	 * as it could be a new untracked file.
 	 */
 	trace_printf_key(&trace_fsmonitor, "fsmonitor_refresh_callback '%s'", name);
-	untracked_cache_invalidate_path(istate, name);
+	untracked_cache_invalidate_path(istate, name, 0);
 }
 
 void refresh_fsmonitor(struct index_state *istate)
diff --git a/fsmonitor.h b/fsmonitor.h
index cd3cc0c..65f3743 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -65,7 +65,7 @@ static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cac
 {
 	if (core_fsmonitor) {
 		ce->ce_flags &= ~CE_FSMONITOR_VALID;
-		untracked_cache_invalidate_path(istate, ce->name);
+		untracked_cache_invalidate_path(istate, ce->name, 1);
 		trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
 	}
 }
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 964c3a7..c1f52e4 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -677,7 +677,7 @@ sub add_untracked_cmd {
 sub run_git_apply {
 	my $cmd = shift;
 	my $fh;
-	open $fh, '| git ' . $cmd . " --recount --allow-overlap";
+	open $fh, '| git ' . $cmd . " --allow-overlap";
 	print $fh @_;
 	return close $fh;
 }
@@ -705,6 +705,14 @@ sub parse_diff {
 	}
 	my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' };
 
+	if (@colored && @colored != @diff) {
+		print STDERR
+		  "fatal: mismatched output from interactive.diffFilter\n",
+		  "hint: Your filter must maintain a one-to-one correspondence\n",
+		  "hint: between its input and output lines.\n";
+		exit 1;
+	}
+
 	for (my $i = 0; $i < @diff; $i++) {
 		if ($diff[$i] =~ /^@@ /) {
 			push @hunk, { TEXT => [], DISPLAY => [],
@@ -751,6 +759,15 @@ sub parse_hunk_header {
 	return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
 }
 
+sub format_hunk_header {
+	my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = @_;
+	return ("@@ -$o_ofs" .
+		(($o_cnt != 1) ? ",$o_cnt" : '') .
+		" +$n_ofs" .
+		(($n_cnt != 1) ? ",$n_cnt" : '') .
+		" @@\n");
+}
+
 sub split_hunk {
 	my ($text, $display) = @_;
 	my @split = ();
@@ -784,6 +801,11 @@ sub split_hunk {
 		while (++$i < @$text) {
 			my $line = $text->[$i];
 			my $display = $display->[$i];
+			if ($line =~ /^\\/) {
+				push @{$this->{TEXT}}, $line;
+				push @{$this->{DISPLAY}}, $display;
+				next;
+			}
 			if ($line =~ /^ /) {
 				if ($this->{ADDDEL} &&
 				    !defined $next_hunk_start) {
@@ -838,11 +860,7 @@ sub split_hunk {
 		my $o_cnt = $hunk->{OCNT};
 		my $n_cnt = $hunk->{NCNT};
 
-		my $head = ("@@ -$o_ofs" .
-			    (($o_cnt != 1) ? ",$o_cnt" : '') .
-			    " +$n_ofs" .
-			    (($n_cnt != 1) ? ",$n_cnt" : '') .
-			    " @@\n");
+		my $head = format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt);
 		my $display_head = $head;
 		unshift @{$hunk->{TEXT}}, $head;
 		if ($diff_use_color) {
@@ -886,6 +904,9 @@ sub merge_hunk {
 			$n_cnt++;
 			push @line, $line;
 			next;
+		} elsif ($line =~ /^\\/) {
+			push @line, $line;
+			next;
 		}
 
 		last if ($o1_ofs <= $ofs);
@@ -904,6 +925,9 @@ sub merge_hunk {
 			$n_cnt++;
 			push @line, $line;
 			next;
+		} elsif ($line =~ /^\\/) {
+			push @line, $line;
+			next;
 		}
 		$ofs++;
 		$o_cnt++;
@@ -912,11 +936,7 @@ sub merge_hunk {
 		}
 		push @line, $line;
 	}
-	my $head = ("@@ -$o0_ofs" .
-		    (($o_cnt != 1) ? ",$o_cnt" : '') .
-		    " +$n0_ofs" .
-		    (($n_cnt != 1) ? ",$n_cnt" : '') .
-		    " @@\n");
+	my $head = format_hunk_header($o0_ofs, $o_cnt, $n0_ofs, $n_cnt);
 	@{$prev->{TEXT}} = ($head, @line);
 }
 
@@ -925,14 +945,35 @@ sub coalesce_overlapping_hunks {
 	my @out = ();
 
 	my ($last_o_ctx, $last_was_dirty);
+	my $ofs_delta = 0;
 
-	for (grep { $_->{USE} } @in) {
+	for (@in) {
 		if ($_->{TYPE} ne 'hunk') {
 			push @out, $_;
 			next;
 		}
 		my $text = $_->{TEXT};
-		my ($o_ofs) = parse_hunk_header($text->[0]);
+		my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
+						parse_hunk_header($text->[0]);
+		unless ($_->{USE}) {
+			$ofs_delta += $o_cnt - $n_cnt;
+			# If this hunk has been edited then subtract
+			# the delta that is due to the edit.
+			if ($_->{OFS_DELTA}) {
+				$ofs_delta -= $_->{OFS_DELTA};
+			}
+			next;
+		}
+		if ($ofs_delta) {
+			$n_ofs += $ofs_delta;
+			$_->{TEXT}->[0] = format_hunk_header($o_ofs, $o_cnt,
+							     $n_ofs, $n_cnt);
+		}
+		# If this hunk was edited then adjust the offset delta
+		# to reflect the edit.
+		if ($_->{OFS_DELTA}) {
+			$ofs_delta += $_->{OFS_DELTA};
+		}
 		if (defined $last_o_ctx &&
 		    $o_ofs <= $last_o_ctx &&
 		    !$_->{DIRTY} &&
@@ -1004,6 +1045,30 @@ marked for discarding."),
 marked for applying."),
 );
 
+sub recount_edited_hunk {
+	local $_;
+	my ($oldtext, $newtext) = @_;
+	my ($o_cnt, $n_cnt) = (0, 0);
+	for (@{$newtext}[1..$#{$newtext}]) {
+		my $mode = substr($_, 0, 1);
+		if ($mode eq '-') {
+			$o_cnt++;
+		} elsif ($mode eq '+') {
+			$n_cnt++;
+		} elsif ($mode eq ' ') {
+			$o_cnt++;
+			$n_cnt++;
+		}
+	}
+	my ($o_ofs, undef, $n_ofs, undef) =
+					parse_hunk_header($newtext->[0]);
+	$newtext->[0] = format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt);
+	my (undef, $orig_o_cnt, undef, $orig_n_cnt) =
+					parse_hunk_header($oldtext->[0]);
+	# Return the change in the number of lines inserted by this hunk
+	return $orig_o_cnt - $orig_n_cnt - $o_cnt + $n_cnt;
+}
+
 sub edit_hunk_manually {
 	my ($oldtext) = @_;
 
@@ -1102,25 +1167,32 @@ sub prompt_yesno {
 }
 
 sub edit_hunk_loop {
-	my ($head, $hunk, $ix) = @_;
-	my $text = $hunk->[$ix]->{TEXT};
+	my ($head, $hunks, $ix) = @_;
+	my $hunk = $hunks->[$ix];
+	my $text = $hunk->{TEXT};
 
 	while (1) {
-		$text = edit_hunk_manually($text);
-		if (!defined $text) {
+		my $newtext = edit_hunk_manually($text);
+		if (!defined $newtext) {
 			return undef;
 		}
 		my $newhunk = {
-			TEXT => $text,
-			TYPE => $hunk->[$ix]->{TYPE},
+			TEXT => $newtext,
+			TYPE => $hunk->{TYPE},
 			USE => 1,
 			DIRTY => 1,
 		};
+		$newhunk->{OFS_DELTA} = recount_edited_hunk($text, $newtext);
+		# If this hunk has already been edited then add the
+		# offset delta of the previous edit to get the real
+		# delta from the original unedited hunk.
+		$hunk->{OFS_DELTA} and
+				$newhunk->{OFS_DELTA} += $hunk->{OFS_DELTA};
 		if (diff_applies($head,
-				 @{$hunk}[0..$ix-1],
+				 @{$hunks}[0..$ix-1],
 				 $newhunk,
-				 @{$hunk}[$ix+1..$#{$hunk}])) {
-			$newhunk->{DISPLAY} = [color_diff(@{$text})];
+				 @{$hunks}[$ix+1..$#{$hunks}])) {
+			$newhunk->{DISPLAY} = [color_diff(@{$newtext})];
 			return $newhunk;
 		}
 		else {
@@ -1184,7 +1256,13 @@ d - do not apply this hunk or any of the later hunks in the file"),
 );
 
 sub help_patch_cmd {
-	print colored $help_color, __($help_patch_modes{$patch_mode}), "\n", __ <<EOF ;
+	local $_;
+	my $other = $_[0] . ",?";
+	print colored $help_color, __($help_patch_modes{$patch_mode}), "\n",
+		map { "$_\n" } grep {
+			my $c = quotemeta(substr($_, 0, 1));
+			$other =~ /,$c/
+		} split "\n", __ <<EOF ;
 g - select a hunk to go to
 / - search for a hunk matching the given regex
 j - leave this hunk undecided, see next undecided hunk
@@ -1302,39 +1380,39 @@ sub display_hunks {
 
 my %patch_update_prompt_modes = (
 	stage => {
-		mode => N__("Stage mode change [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Stage deletion [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Stage this hunk [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Stage mode change [y,n,q,a,d%s,?]? "),
+		deletion => N__("Stage deletion [y,n,q,a,d%s,?]? "),
+		hunk => N__("Stage this hunk [y,n,q,a,d%s,?]? "),
 	},
 	stash => {
-		mode => N__("Stash mode change [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Stash deletion [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Stash this hunk [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Stash mode change [y,n,q,a,d%s,?]? "),
+		deletion => N__("Stash deletion [y,n,q,a,d%s,?]? "),
+		hunk => N__("Stash this hunk [y,n,q,a,d%s,?]? "),
 	},
 	reset_head => {
-		mode => N__("Unstage mode change [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Unstage deletion [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Unstage this hunk [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Unstage mode change [y,n,q,a,d%s,?]? "),
+		deletion => N__("Unstage deletion [y,n,q,a,d%s,?]? "),
+		hunk => N__("Unstage this hunk [y,n,q,a,d%s,?]? "),
 	},
 	reset_nothead => {
-		mode => N__("Apply mode change to index [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Apply deletion to index [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Apply this hunk to index [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Apply mode change to index [y,n,q,a,d%s,?]? "),
+		deletion => N__("Apply deletion to index [y,n,q,a,d%s,?]? "),
+		hunk => N__("Apply this hunk to index [y,n,q,a,d%s,?]? "),
 	},
 	checkout_index => {
-		mode => N__("Discard mode change from worktree [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Discard deletion from worktree [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
+		deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+		hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
 	},
 	checkout_head => {
-		mode => N__("Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
+		deletion => N__("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
+		hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
 	},
 	checkout_nothead => {
-		mode => N__("Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "),
-		deletion => N__("Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "),
-		hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "),
+		mode => N__("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
+		deletion => N__("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
+		hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
 	},
 );
 
@@ -1390,7 +1468,7 @@ sub patch_update_file {
 			$other .= ',J';
 		}
 		if ($num > 1) {
-			$other .= ',g';
+			$other .= ',g,/';
 		}
 		for ($i = 0; $i < $num; $i++) {
 			if (!defined $hunk[$i]{USE}) {
@@ -1431,8 +1509,12 @@ sub patch_update_file {
 				}
 				next;
 			}
-			elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
+			elsif ($line =~ /^g(.*)/) {
 				my $response = $1;
+				unless ($other =~ /g/) {
+					error_msg __("No other hunks to goto\n");
+					next;
+				}
 				my $no = $ix > 10 ? $ix - 10 : 0;
 				while ($response eq '') {
 					$no = display_hunks(\@hunk, $no);
@@ -1478,7 +1560,11 @@ sub patch_update_file {
 			}
 			elsif ($line =~ m|^/(.*)|) {
 				my $regex = $1;
-				if ($1 eq "") {
+				unless ($other =~ m|/|) {
+					error_msg __("No other hunks to search\n");
+					next;
+				}
+				if ($regex eq "") {
 					print colored $prompt_color, __("search for regex? ");
 					$regex = <STDIN>;
 					if (defined $regex) {
@@ -1546,7 +1632,11 @@ sub patch_update_file {
 					next;
 				}
 			}
-			elsif ($other =~ /s/ && $line =~ /^s/) {
+			elsif ($line =~ /^s/) {
+				unless ($other =~ /s/) {
+					error_msg __("Sorry, cannot split this hunk\n");
+					next;
+				}
 				my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
 				if (1 < @split) {
 					print colored $header_color, sprintf(
@@ -1558,7 +1648,11 @@ sub patch_update_file {
 				$num = scalar @hunk;
 				next;
 			}
-			elsif ($other =~ /e/ && $line =~ /^e/) {
+			elsif ($line =~ /^e/) {
+				unless ($other =~ /e/) {
+					error_msg __("Sorry, cannot edit this hunk\n");
+					next;
+				}
 				my $newhunk = edit_hunk_loop($head, \@hunk, $ix);
 				if (defined $newhunk) {
 					splice @hunk, $ix, 1, $newhunk;
diff --git a/git-compat-util.h b/git-compat-util.h
index 68b2ad5..07e3832 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -826,8 +826,8 @@ extern ssize_t xpread(int fd, void *buf, size_t len, off_t offset);
 extern int xdup(int fd);
 extern FILE *xfopen(const char *path, const char *mode);
 extern FILE *xfdopen(int fd, const char *mode);
-extern int xmkstemp(char *template);
-extern int xmkstemp_mode(char *template, int mode);
+extern int xmkstemp(char *temp_filename);
+extern int xmkstemp_mode(char *temp_filename, int mode);
 extern char *xgetcwd(void);
 extern FILE *fopen_for_writing(const char *path);
 extern FILE *fopen_or_warn(const char *path, const char *mode);
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2d8df83..b31613c 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -601,7 +601,9 @@ sub pdate($) {
 	my ($d) = @_;
 	m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
 		or die "Unparseable date: $d\n";
-	my $y=$1; $y-=1900 if $y>1900;
+	my $y=$1;
+	$y+=100 if $y<70;
+	$y+=1900 if $y<1000;
 	return timegm($6||0,$5,$4,$3,$2-1,$y);
 }
 
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 1b7e4b2..64f2154 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -251,8 +251,18 @@ done < "$tempdir"/backup-refs
 
 # The refs should be updated if their heads were rewritten
 git rev-parse --no-flags --revs-only --symbolic-full-name \
-	--default HEAD "$@" > "$tempdir"/raw-heads || exit
-sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads
+	--default HEAD "$@" > "$tempdir"/raw-refs || exit
+while read ref
+do
+	case "$ref" in ^?*) continue ;; esac
+
+	if git rev-parse --verify "$ref"^0 >/dev/null 2>&1
+	then
+		echo "$ref"
+	else
+		warn "WARNING: not rewriting '$ref' (not a committish)"
+	fi
+done >"$tempdir"/heads <"$tempdir"/raw-refs
 
 test -s "$tempdir"/heads ||
 	die "You must specify a ref to rewrite."
@@ -310,7 +320,7 @@ git rev-list --reverse --topo-order --default HEAD \
 	die "Could not get the commits"
 commits=$(wc -l <../revs | tr -d " ")
 
-test $commits -eq 0 && die "Found nothing to rewrite"
+test $commits -eq 0 && die_with_status 2 "Found nothing to rewrite"
 
 # Rewrite the commits
 report_progress ()
@@ -627,12 +637,12 @@ then
 				print H "$_:$f\n" or die;
 			}
 			close(H) or die;' || die "Unable to save state")
-	state_tree=$(/bin/echo -e "100644 blob $state_blob\tfilter.map" | git mktree)
+	state_tree=$(printf '100644 blob %s\tfilter.map\n' "$state_blob" | git mktree)
 	if test -n "$state_commit"
 	then
-		state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" -p "$state_commit")
+		state_commit=$(echo "Sync" | git commit-tree "$state_tree" -p "$state_commit")
 	else
-		state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" )
+		state_commit=$(echo "Sync" | git commit-tree "$state_tree" )
 	fi
 	git update-ref "$state_branch" "$state_commit"
 fi
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 14c5078..e5fd610 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -4,15 +4,6 @@
 # Copyright (c) 2010 Junio C Hamano.
 #
 
-# The whole contents of this file is run by dot-sourcing it from
-# inside a shell function.  It used to be that "return"s we see
-# below were not inside any function, and expected to return
-# to the function that dot-sourced us.
-#
-# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
-# construct and continue to run the statements that follow such a "return".
-# As a work-around, we introduce an extra layer of a function
-# here, and immediately call it after defining it.
 git_rebase__am () {
 
 case "$action" in
@@ -27,6 +18,9 @@ skip)
 	move_to_original_branch
 	return
 	;;
+show-current-patch)
+	exec git am --show-current-patch
+	;;
 esac
 
 if test -z "$rebase_root"
@@ -46,6 +40,7 @@ then
 	# makes this easy
 	git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
 		$allow_rerere_autoupdate --right-only "$revisions" \
+		$allow_empty_message \
 		${restrict_revision+^$restrict_revision}
 	ret=$?
 else
@@ -101,5 +96,3 @@ fi
 move_to_original_branch
 
 }
-# ... and then we call the whole thing.
-git_rebase__am
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index d47bd29..50323fc 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -199,12 +199,14 @@ make_patch () {
 
 die_with_patch () {
 	echo "$1" > "$state_dir"/stopped-sha
+	git update-ref REBASE_HEAD "$1"
 	make_patch "$1"
 	die "$2"
 }
 
 exit_with_patch () {
 	echo "$1" > "$state_dir"/stopped-sha
+	git update-ref REBASE_HEAD "$1"
 	make_patch $1
 	git rev-parse --verify HEAD > "$amend"
 	gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
@@ -281,7 +283,7 @@ pick_one () {
 
 	test -d "$rewritten" &&
 		pick_one_preserving_merges "$@" && return
-	output eval git cherry-pick $allow_rerere_autoupdate \
+	output eval git cherry-pick $allow_rerere_autoupdate $allow_empty_message \
 			${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
 			"$strategy_args" $empty_args $ff "$@"
 
@@ -305,17 +307,14 @@ pick_one_preserving_merges () {
 	esac
 	sha1=$(git rev-parse $sha1)
 
-	if test -f "$state_dir"/current-commit
+	if test -f "$state_dir"/current-commit && test "$fast_forward" = t
 	then
-		if test "$fast_forward" = t
-		then
-			while read current_commit
-			do
-				git rev-parse HEAD > "$rewritten"/$current_commit
-			done <"$state_dir"/current-commit
-			rm "$state_dir"/current-commit ||
-				die "$(gettext "Cannot write current commit's replacement sha1")"
-		fi
+		while read current_commit
+		do
+			git rev-parse HEAD > "$rewritten"/$current_commit
+		done <"$state_dir"/current-commit
+		rm "$state_dir"/current-commit ||
+			die "$(gettext "Cannot write current commit's replacement sha1")"
 	fi
 
 	echo $sha1 >> "$state_dir"/current-commit
@@ -396,7 +395,7 @@ pick_one_preserving_merges () {
 					--sq-quote "$gpg_sign_opt")} \
 				$allow_rerere_autoupdate "$merge_args" \
 				"$strategy_args" \
-				-m $(git rev-parse --sq-quote "$msg_content") \
+				-m "$(git rev-parse --sq-quote "$msg_content")" \
 				"$new_parents"
 			then
 				printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
@@ -406,6 +405,7 @@ pick_one_preserving_merges () {
 			;;
 		*)
 			output eval git cherry-pick $allow_rerere_autoupdate \
+				$allow_empty_message \
 				${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
 				"$strategy_args" "$@" ||
 				die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
@@ -559,7 +559,8 @@ do_next () {
 
 		mark_action_done
 		do_pick $sha1 "$rest"
-		git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} || {
+		git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} \
+			$allow_empty_message || {
 			warn "$(eval_gettext "\
 Could not amend commit after successfully picking \$sha1... \$rest
 This is most likely due to an empty commit message, or the pre-commit hook
@@ -607,7 +608,7 @@ you are able to reword the commit.")"
 			# This is an intermediate commit; its message will only be
 			# used in case of trouble.  So use the long version:
 			do_with_author output git commit --amend --no-verify -F "$squash_msg" \
-				${gpg_sign_opt:+"$gpg_sign_opt"} ||
+				${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
 				die_failed_squash $sha1 "$rest"
 			;;
 		*)
@@ -615,13 +616,13 @@ you are able to reword the commit.")"
 			if test -f "$fixup_msg"
 			then
 				do_with_author git commit --amend --no-verify -F "$fixup_msg" \
-					${gpg_sign_opt:+"$gpg_sign_opt"} ||
+					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
 					die_failed_squash $sha1 "$rest"
 			else
 				cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
 				rm -f "$GIT_DIR"/MERGE_MSG
 				do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \
-					${gpg_sign_opt:+"$gpg_sign_opt"} ||
+					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
 					die_failed_squash $sha1 "$rest"
 			fi
 			rm -f "$squash_msg" "$fixup_msg"
@@ -739,36 +740,39 @@ get_missing_commit_check_level () {
 	printf '%s' "$check_level" | tr 'A-Z' 'a-z'
 }
 
-# The whole contents of this file is run by dot-sourcing it from
-# inside a shell function.  It used to be that "return"s we see
-# below were not inside any function, and expected to return
-# to the function that dot-sourced us.
+# Initiate an action. If the cannot be any
+# further action it  may exec a command
+# or exit and not return.
 #
-# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
-# construct and continue to run the statements that follow such a "return".
-# As a work-around, we introduce an extra layer of a function
-# here, and immediately call it after defining it.
-git_rebase__interactive () {
-
-case "$action" in
-continue)
-	if test ! -d "$rewritten"
-	then
-		exec git rebase--helper ${force_rebase:+--no-ff} --continue
-	fi
-	# do we have anything to commit?
-	if git diff-index --cached --quiet HEAD --
-	then
-		# Nothing to commit -- skip this commit
-
-		test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
-		rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
-		die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
-	else
-		if ! test -f "$author_script"
+# TODO: Consider a cleaner return model so it
+# never exits and always return 0 if process
+# is complete.
+#
+# Parameter 1 is the action to initiate.
+#
+# Returns 0 if the action was able to complete
+# and if 1 if further processing is required.
+initiate_action () {
+	case "$1" in
+	continue)
+		if test ! -d "$rewritten"
 		then
-			gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
-			die "$(eval_gettext "\
+			exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
+				--continue
+		fi
+		# do we have anything to commit?
+		if git diff-index --cached --quiet HEAD --
+		then
+			# Nothing to commit -- skip this commit
+
+			test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
+			rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
+			die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
+		else
+			if ! test -f "$author_script"
+			then
+				gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
+				die "$(eval_gettext "\
 You have staged changes in your working tree.
 If these changes are meant to be
 squashed into the previous commit, run:
@@ -783,83 +787,199 @@ In both cases, once you're done, continue with:
 
   git rebase --continue
 ")"
-		fi
-		. "$author_script" ||
-			die "$(gettext "Error trying to find the author identity to amend commit")"
-		if test -f "$amend"
-		then
-			current_head=$(git rev-parse --verify HEAD)
-			test "$current_head" = $(cat "$amend") ||
-			die "$(gettext "\
+			fi
+			. "$author_script" ||
+				die "$(gettext "Error trying to find the author identity to amend commit")"
+			if test -f "$amend"
+			then
+				current_head=$(git rev-parse --verify HEAD)
+				test "$current_head" = $(cat "$amend") ||
+				die "$(gettext "\
 You have uncommitted changes in your working tree. Please commit them
 first and then run 'git rebase --continue' again.")"
-			do_with_author git commit --amend --no-verify -F "$msg" -e \
-				${gpg_sign_opt:+"$gpg_sign_opt"} ||
-				die "$(gettext "Could not commit staged changes.")"
-		else
-			do_with_author git commit --no-verify -F "$msg" -e \
-				${gpg_sign_opt:+"$gpg_sign_opt"} ||
-				die "$(gettext "Could not commit staged changes.")"
+				do_with_author git commit --amend --no-verify -F "$msg" -e \
+					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
+					die "$(gettext "Could not commit staged changes.")"
+			else
+				do_with_author git commit --no-verify -F "$msg" -e \
+					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
+					die "$(gettext "Could not commit staged changes.")"
+			fi
 		fi
-	fi
 
-	if test -r "$state_dir"/stopped-sha
+		if test -r "$state_dir"/stopped-sha
+		then
+			record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
+		fi
+
+		require_clean_work_tree "rebase"
+		do_rest
+		return 0
+		;;
+	skip)
+		git rerere clear
+
+		if test ! -d "$rewritten"
+		then
+			exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
+				--continue
+		fi
+		do_rest
+		return 0
+		;;
+	edit-todo)
+		git stripspace --strip-comments <"$todo" >"$todo".new
+		mv -f "$todo".new "$todo"
+		collapse_todo_ids
+		append_todo_help
+		gettext "
+You are editing the todo file of an ongoing interactive rebase.
+To continue rebase after editing, run:
+    git rebase --continue
+
+" | git stripspace --comment-lines >>"$todo"
+
+		git_sequence_editor "$todo" ||
+			die "$(gettext "Could not execute editor")"
+		expand_todo_ids
+
+		exit
+		;;
+	show-current-patch)
+		exec git show REBASE_HEAD --
+		;;
+	*)
+		return 1 # continue
+		;;
+	esac
+}
+
+setup_reflog_action () {
+	comment_for_reflog start
+
+	if test ! -z "$switch_to"
 	then
-		record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
+		GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
+		output git checkout "$switch_to" -- ||
+			die "$(eval_gettext "Could not checkout \$switch_to")"
+
+		comment_for_reflog start
 	fi
+}
 
-	require_clean_work_tree "rebase"
-	do_rest
-	return 0
-	;;
-skip)
-	git rerere clear
+init_basic_state () {
+	orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
+	mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
+	rm -f "$(git rev-parse --git-path REBASE_HEAD)"
+
+	: > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
+	write_basic_state
+}
 
-	if test ! -d "$rewritten"
+init_revisions_and_shortrevisions () {
+	shorthead=$(git rev-parse --short $orig_head)
+	shortonto=$(git rev-parse --short $onto)
+	if test -z "$rebase_root"
+		# this is now equivalent to ! -z "$upstream"
 	then
-		exec git rebase--helper ${force_rebase:+--no-ff} --continue
+		shortupstream=$(git rev-parse --short $upstream)
+		revisions=$upstream...$orig_head
+		shortrevisions=$shortupstream..$shorthead
+	else
+		revisions=$onto...$orig_head
+		shortrevisions=$shorthead
 	fi
-	do_rest
-	return 0
-	;;
-edit-todo)
-	git stripspace --strip-comments <"$todo" >"$todo".new
-	mv -f "$todo".new "$todo"
-	collapse_todo_ids
+}
+
+complete_action() {
+	test -s "$todo" || echo noop >> "$todo"
+	test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
+	test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd"
+
+	todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
+	todocount=${todocount##* }
+
+cat >>"$todo" <<EOF
+
+$comment_char $(eval_ngettext \
+	"Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
+	"Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
+	"$todocount")
+EOF
 	append_todo_help
 	gettext "
-You are editing the todo file of an ongoing interactive rebase.
-To continue rebase after editing, run:
-    git rebase --continue
+	However, if you remove everything, the rebase will be aborted.
 
-" | git stripspace --comment-lines >>"$todo"
+	" | git stripspace --comment-lines >>"$todo"
 
+	if test -z "$keep_empty"
+	then
+		printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
+	fi
+
+
+	has_action "$todo" ||
+		return 2
+
+	cp "$todo" "$todo".backup
+	collapse_todo_ids
 	git_sequence_editor "$todo" ||
-		die "$(gettext "Could not execute editor")"
+		die_abort "$(gettext "Could not execute editor")"
+
+	has_action "$todo" ||
+		return 2
+
+	git rebase--helper --check-todo-list || {
+		ret=$?
+		checkout_onto
+		exit $ret
+	}
+
 	expand_todo_ids
 
-	exit
-	;;
-esac
+	test -d "$rewritten" || test -n "$force_rebase" ||
+	onto="$(git rebase--helper --skip-unnecessary-picks)" ||
+	die "Could not skip unnecessary pick commands"
 
-comment_for_reflog start
+	checkout_onto
+	if test -z "$rebase_root" && test ! -d "$rewritten"
+	then
+		require_clean_work_tree "rebase"
+		exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
+			--continue
+	fi
+	do_rest
+}
 
-if test ! -z "$switch_to"
-then
-	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
-	output git checkout "$switch_to" -- ||
-		die "$(eval_gettext "Could not checkout \$switch_to")"
+git_rebase__interactive () {
+	initiate_action "$action"
+	ret=$?
+	if test $ret = 0; then
+		return 0
+	fi
 
-	comment_for_reflog start
-fi
+	setup_reflog_action
+	init_basic_state
+
+	init_revisions_and_shortrevisions
+
+	git rebase--helper --make-script ${keep_empty:+--keep-empty} \
+		$revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
+	die "$(gettext "Could not generate todo list")"
 
-orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
-mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
+	complete_action
+}
+
+git_rebase__interactive__preserve_merges () {
+	initiate_action "$action"
+	ret=$?
+	if test $ret = 0; then
+		return 0
+	fi
+
+	setup_reflog_action
+	init_basic_state
 
-: > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
-write_basic_state
-if test t = "$preserve_merges"
-then
 	if test -z "$rebase_root"
 	then
 		mkdir "$rewritten" &&
@@ -873,41 +993,17 @@ then
 		echo $onto > "$rewritten"/root ||
 			die "$(gettext "Could not init rewritten commits")"
 	fi
-	# No cherry-pick because our first pass is to determine
-	# parents to rewrite and skipping dropped commits would
-	# prematurely end our probe
-	merges_option=
-else
-	merges_option="--no-merges --cherry-pick"
-fi
-
-shorthead=$(git rev-parse --short $orig_head)
-shortonto=$(git rev-parse --short $onto)
-if test -z "$rebase_root"
-	# this is now equivalent to ! -z "$upstream"
-then
-	shortupstream=$(git rev-parse --short $upstream)
-	revisions=$upstream...$orig_head
-	shortrevisions=$shortupstream..$shorthead
-else
-	revisions=$onto...$orig_head
-	shortrevisions=$shorthead
-fi
-if test t != "$preserve_merges"
-then
-	git rebase--helper --make-script ${keep_empty:+--keep-empty} \
-		$revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
-	die "$(gettext "Could not generate todo list")"
-else
+
+	init_revisions_and_shortrevisions
+
 	format=$(git config --get rebase.instructionFormat)
 	# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
-	git rev-list $merges_option --format="%m%H ${format:-%s}" \
+	git rev-list --format="%m%H ${format:-%s}" \
 		--reverse --left-right --topo-order \
 		$revisions ${restrict_revision+^$restrict_revision} | \
 		sed -n "s/^>//p" |
 	while read -r sha1 rest
 	do
-
 		if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
 		then
 			comment_out="$comment_char "
@@ -934,11 +1030,8 @@ else
 			printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
 		fi
 	done
-fi
 
-# Watch for commits that been dropped by --cherry-pick
-if test t = "$preserve_merges"
-then
+	# Watch for commits that been dropped by --cherry-pick
 	mkdir "$dropped"
 	# Save all non-cherry-picked changes
 	git rev-list $revisions --left-right --cherry-pick | \
@@ -961,65 +1054,6 @@ then
 			rm "$rewritten"/$rev
 		fi
 	done
-fi
-
-test -s "$todo" || echo noop >> "$todo"
-test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
-test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd"
-
-todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
-todocount=${todocount##* }
-
-cat >>"$todo" <<EOF
-
-$comment_char $(eval_ngettext \
-	"Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
-	"Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
-	"$todocount")
-EOF
-append_todo_help
-gettext "
-However, if you remove everything, the rebase will be aborted.
-
-" | git stripspace --comment-lines >>"$todo"
-
-if test -z "$keep_empty"
-then
-	printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
-fi
-
-
-has_action "$todo" ||
-	return 2
-
-cp "$todo" "$todo".backup
-collapse_todo_ids
-git_sequence_editor "$todo" ||
-	die_abort "$(gettext "Could not execute editor")"
-
-has_action "$todo" ||
-	return 2
-
-git rebase--helper --check-todo-list || {
-	ret=$?
-	checkout_onto
-	exit $ret
-}
-
-expand_todo_ids
-
-test -d "$rewritten" || test -n "$force_rebase" ||
-onto="$(git rebase--helper --skip-unnecessary-picks)" ||
-die "Could not skip unnecessary pick commands"
-
-checkout_onto
-if test -z "$rebase_root" && test ! -d "$rewritten"
-then
-	require_clean_work_tree "rebase"
-	exec git rebase--helper ${force_rebase:+--no-ff} --continue
-fi
-do_rest
 
+	complete_action
 }
-# ... and then we call the whole thing.
-git_rebase__interactive
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 06a4723..685f48c 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -27,7 +27,8 @@ continue_merge () {
 	cmt=$(cat "$state_dir/current")
 	if ! git diff-index --quiet --ignore-submodules HEAD --
 	then
-		if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
+		if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message \
+			--no-verify -C "$cmt"
 		then
 			echo "Commit failed, please do not call \"git commit\""
 			echo "directly, but instead do one of the following: "
@@ -57,6 +58,7 @@ call_merge () {
 	echo "$msgnum" >"$state_dir/msgnum"
 	cmt="$(cat "$state_dir/cmt.$msgnum")"
 	echo "$cmt" > "$state_dir/current"
+	git update-ref REBASE_HEAD "$cmt"
 	hd=$(git rev-parse --verify HEAD)
 	cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
 	eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
@@ -102,15 +104,6 @@ finish_rb_merge () {
 	say All done.
 }
 
-# The whole contents of this file is run by dot-sourcing it from
-# inside a shell function.  It used to be that "return"s we see
-# below were not inside any function, and expected to return
-# to the function that dot-sourced us.
-#
-# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
-# construct and continue to run the statements that follow such a "return".
-# As a work-around, we introduce an extra layer of a function
-# here, and immediately call it after defining it.
 git_rebase__merge () {
 
 case "$action" in
@@ -137,11 +130,15 @@ skip)
 	finish_rb_merge
 	return
 	;;
+show-current-patch)
+	exec git show REBASE_HEAD --
+	;;
 esac
 
 mkdir -p "$state_dir"
 echo "$onto_name" > "$state_dir/onto_name"
 write_basic_state
+rm -f "$(git rev-parse --git-path REBASE_HEAD)"
 
 msgnum=0
 for cmt in $(git rev-list --reverse --no-merges "$revisions")
@@ -165,5 +162,3 @@ done
 finish_rb_merge
 
 }
-# ... and then we call the whole thing.
-git_rebase__merge
diff --git a/git-rebase.sh b/git-rebase.sh
index fd72a35..fb64ee1 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -24,6 +24,7 @@ m,merge!           use merging strategies to rebase
 i,interactive!     let the user edit the list of commits to rebase
 x,exec=!           add exec lines after each commit of the editable list
 k,keep-empty	   preserve empty commits during rebase
+allow-empty-message allow rebasing commits with empty messages
 f,force-rebase!    force rebase even if branch is up to date
 X,strategy-option=! pass the argument through to the merge strategy
 stat!              display a diffstat of what changed upstream
@@ -45,6 +46,7 @@ abort!             abort and check out the original branch
 skip!              skip current patch and continue
 edit-todo!         edit the todo list during an interactive rebase
 quit!              abort but keep HEAD where it is
+show-current-patch! show the patch file being applied or merged
 "
 . git-sh-setup
 set_reflog_action rebase
@@ -89,6 +91,7 @@ action=
 preserve_merges=
 autosquash=
 keep_empty=
+allow_empty_message=
 test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
 case "$(git config --bool commit.gpgsign)" in
 true)	gpg_sign_opt=-S ;;
@@ -181,6 +184,7 @@ You can run "git stash pop" or "git stash drop" at any time.
 }
 
 finish_rebase () {
+	rm -f "$(git rev-parse --git-path REBASE_HEAD)"
 	apply_autostash &&
 	{ git gc --auto || true; } &&
 	rm -rf "$state_dir"
@@ -193,6 +197,7 @@ run_specific_rebase () {
 		autosquash=
 	fi
 	. git-rebase--$type
+	git_rebase__$type${preserve_merges:+__preserve_merges}
 	ret=$?
 	if test $ret -eq 0
 	then
@@ -245,7 +250,7 @@ do
 	--verify)
 		ok_to_skip_pre_rebase=
 		;;
-	--continue|--skip|--abort|--quit|--edit-todo)
+	--continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)
 		test $total_argc -eq 2 || usage
 		action=${1##--}
 		;;
@@ -262,6 +267,9 @@ do
 	--keep-empty)
 		keep_empty=yes
 		;;
+	--allow-empty-message)
+		allow_empty_message=--allow-empty-message
+		;;
 	--preserve-merges)
 		preserve_merges=t
 		test -z "$interactive_rebase" && interactive_rebase=implied
@@ -412,6 +420,10 @@ quit)
 edit-todo)
 	run_specific_rebase
 	;;
+show-current-patch)
+	run_specific_rebase
+	die "BUG: run_specific_rebase is not supposed to return here"
+	;;
 esac
 
 # Make sure no rebase is in progress
diff --git a/git-send-email.perl b/git-send-email.perl
index bbf4dea..2fa7818 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -26,11 +26,13 @@ use Text::ParseWords;
 use Term::ANSIColor;
 use File::Temp qw/ tempdir tempfile /;
 use File::Spec::Functions qw(catdir catfile);
-use Git::Error qw(:try);
+use Git::LoadCPAN::Error qw(:try);
 use Cwd qw(abs_path cwd);
 use Git;
 use Git::I18N;
-use Git::Mail::Address;
+use Net::Domain ();
+use Net::SMTP ();
+use Git::LoadCPAN::Mail::Address;
 
 Getopt::Long::Configure qw/ pass_through /;
 
@@ -57,6 +59,7 @@ git send-email --dump-aliases
     --[no-]cc               <str>  * Email Cc:
     --[no-]bcc              <str>  * Email Bcc:
     --subject               <str>  * Email "Subject:"
+    --reply-to              <str>  * Email "Reply-To:"
     --in-reply-to           <str>  * Email "In-Reply-To:"
     --[no-]xmailer                 * Add "X-Mailer:" header (default).
     --[no-]annotate                * Review each patch that will be sent in an editor.
@@ -167,13 +170,13 @@ my $re_encoded_word = qr/=\?($re_token)\?($re_token)\?($re_encoded_text)\?=/;
 
 # Variables we fill in automatically, or via prompting:
 my (@to,$no_to,@initial_to,@cc,$no_cc,@initial_cc,@bcclist,$no_bcc,@xh,
-	$initial_reply_to,$initial_subject,@files,
+	$initial_in_reply_to,$reply_to,$initial_subject,@files,
 	$author,$sender,$smtp_authpass,$annotate,$use_xmailer,$compose,$time);
 
 my $envelope_sender;
 
 # Example reply to:
-#$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
+#$initial_in_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
 
 my $repo = eval { Git->repository() };
 my @repo = $repo ? ($repo) : ();
@@ -315,7 +318,8 @@ die __("--dump-aliases incompatible with other options\n")
     if !$help and $dump_aliases and @ARGV;
 $rc = GetOptions(
 		    "sender|from=s" => \$sender,
-                    "in-reply-to=s" => \$initial_reply_to,
+                    "in-reply-to=s" => \$initial_in_reply_to,
+		    "reply-to=s" => \$reply_to,
 		    "subject=s" => \$initial_subject,
 		    "to=s" => \@initial_to,
 		    "to-cmd=s" => \$to_cmd,
@@ -379,6 +383,10 @@ unless ($rc) {
 die __("Cannot run git format-patch from outside a repository\n")
 	if $format_patch and not $repo;
 
+die __("`batch-size` and `relogin` must be specified together " .
+	"(via command-line or configuration option)\n")
+	if defined $relogin_delay and not defined $batch_size;
+
 # Now, let's fill any that aren't set in with defaults:
 
 sub read_config {
@@ -677,7 +685,8 @@ if ($compose) {
 
 	my $tpl_sender = $sender || $repoauthor || $repocommitter || '';
 	my $tpl_subject = $initial_subject || '';
-	my $tpl_reply_to = $initial_reply_to || '';
+	my $tpl_in_reply_to = $initial_in_reply_to || '';
+	my $tpl_reply_to = $reply_to || '';
 
 	print $c <<EOT1, Git::prefix_lines("GIT: ", __ <<EOT2), <<EOT3;
 From $tpl_sender # This line is ignored.
@@ -689,8 +698,9 @@ for the patch you are writing.
 Clear the body content if you don't wish to send a summary.
 EOT2
 From: $tpl_sender
+Reply-To: $tpl_reply_to
 Subject: $tpl_subject
-In-Reply-To: $tpl_reply_to
+In-Reply-To: $tpl_in_reply_to
 
 EOT3
 	for my $f (@files) {
@@ -704,57 +714,73 @@ EOT3
 		do_edit($compose_filename);
 	}
 
-	open my $c2, ">", $compose_filename . ".final"
-		or die sprintf(__("Failed to open %s.final: %s"), $compose_filename, $!);
-
 	open $c, "<", $compose_filename
 		or die sprintf(__("Failed to open %s: %s"), $compose_filename, $!);
 
-	my $need_8bit_cte = file_has_nonascii($compose_filename);
-	my $in_body = 0;
-	my $summary_empty = 1;
 	if (!defined $compose_encoding) {
 		$compose_encoding = "UTF-8";
 	}
-	while(<$c>) {
-		next if m/^GIT:/;
-		if ($in_body) {
-			$summary_empty = 0 unless (/^\n$/);
-		} elsif (/^\n$/) {
-			$in_body = 1;
-			if ($need_8bit_cte) {
-				print $c2 "MIME-Version: 1.0\n",
-					 "Content-Type: text/plain; ",
-					   "charset=$compose_encoding\n",
-					 "Content-Transfer-Encoding: 8bit\n";
-			}
-		} elsif (/^MIME-Version:/i) {
-			$need_8bit_cte = 0;
-		} elsif (/^Subject:\s*(.+)\s*$/i) {
-			$initial_subject = $1;
-			my $subject = $initial_subject;
-			$_ = "Subject: " .
-				quote_subject($subject, $compose_encoding) .
-				"\n";
-		} elsif (/^In-Reply-To:\s*(.+)\s*$/i) {
-			$initial_reply_to = $1;
-			next;
-		} elsif (/^From:\s*(.+)\s*$/i) {
-			$sender = $1;
-			next;
-		} elsif (/^(?:To|Cc|Bcc):/i) {
-			print __("To/Cc/Bcc fields are not interpreted yet, they have been ignored\n");
-			next;
+
+	my %parsed_email;
+	while (my $line = <$c>) {
+		next if $line =~ m/^GIT:/;
+		parse_header_line($line, \%parsed_email);
+		if ($line =~ /^$/) {
+			$parsed_email{'body'} = filter_body($c);
 		}
-		print $c2 $_;
 	}
 	close $c;
-	close $c2;
 
-	if ($summary_empty) {
+	open my $c2, ">", $compose_filename . ".final"
+	or die sprintf(__("Failed to open %s.final: %s"), $compose_filename, $!);
+
+
+	if ($parsed_email{'From'}) {
+		$sender = delete($parsed_email{'From'});
+	}
+	if ($parsed_email{'In-Reply-To'}) {
+		$initial_in_reply_to = delete($parsed_email{'In-Reply-To'});
+	}
+	if ($parsed_email{'Reply-To'}) {
+		$reply_to = delete($parsed_email{'Reply-To'});
+	}
+	if ($parsed_email{'Subject'}) {
+		$initial_subject = delete($parsed_email{'Subject'});
+		print $c2 "Subject: " .
+			quote_subject($initial_subject, $compose_encoding) .
+			"\n";
+	}
+
+	if ($parsed_email{'MIME-Version'}) {
+		print $c2 "MIME-Version: $parsed_email{'MIME-Version'}\n",
+				"Content-Type: $parsed_email{'Content-Type'};\n",
+				"Content-Transfer-Encoding: $parsed_email{'Content-Transfer-Encoding'}\n";
+		delete($parsed_email{'MIME-Version'});
+		delete($parsed_email{'Content-Type'});
+		delete($parsed_email{'Content-Transfer-Encoding'});
+	} elsif (file_has_nonascii($compose_filename)) {
+		my $content_type = (delete($parsed_email{'Content-Type'}) or
+			"text/plain; charset=$compose_encoding");
+		print $c2 "MIME-Version: 1.0\n",
+			"Content-Type: $content_type\n",
+			"Content-Transfer-Encoding: 8bit\n";
+	}
+	# Preserve unknown headers
+	foreach my $key (keys %parsed_email) {
+		next if $key eq 'body';
+		print $c2 "$key: $parsed_email{$key}";
+	}
+
+	if ($parsed_email{'body'}) {
+		print $c2 "\n$parsed_email{'body'}\n";
+		delete($parsed_email{'body'});
+	} else {
 		print __("Summary email is empty, skipping it\n");
 		$compose = -1;
 	}
+
+	close $c2;
+
 } elsif ($annotate) {
 	do_edit(@files);
 }
@@ -793,6 +819,32 @@ sub ask {
 	return;
 }
 
+sub parse_header_line {
+	my $lines = shift;
+	my $parsed_line = shift;
+	my $addr_pat = join "|", qw(To Cc Bcc);
+
+	foreach (split(/\n/, $lines)) {
+		if (/^($addr_pat):\s*(.+)$/i) {
+		        $parsed_line->{$1} = [ parse_address_line($2) ];
+		} elsif (/^([^:]*):\s*(.+)\s*$/i) {
+		        $parsed_line->{$1} = $2;
+		}
+	}
+}
+
+sub filter_body {
+	my $c = shift;
+	my $body = "";
+	while (my $body_line = <$c>) {
+		if ($body_line !~ m/^GIT:/) {
+			$body .= $body_line;
+		}
+	}
+	return $body;
+}
+
+
 my %broken_encoding;
 
 sub file_declares_8bit_cte {
@@ -873,16 +925,22 @@ sub expand_one_alias {
 @initial_cc = process_address_list(@initial_cc);
 @bcclist = process_address_list(@bcclist);
 
-if ($thread && !defined $initial_reply_to && $prompting) {
-	$initial_reply_to = ask(
+if ($thread && !defined $initial_in_reply_to && $prompting) {
+	$initial_in_reply_to = ask(
 		__("Message-ID to be used as In-Reply-To for the first email (if any)? "),
 		default => "",
 		valid_re => qr/\@.*\./, confirm_only => 1);
 }
-if (defined $initial_reply_to) {
-	$initial_reply_to =~ s/^\s*<?//;
-	$initial_reply_to =~ s/>?\s*$//;
-	$initial_reply_to = "<$initial_reply_to>" if $initial_reply_to ne '';
+if (defined $initial_in_reply_to) {
+	$initial_in_reply_to =~ s/^\s*<?//;
+	$initial_in_reply_to =~ s/>?\s*$//;
+	$initial_in_reply_to = "<$initial_in_reply_to>" if $initial_in_reply_to ne '';
+}
+
+if (defined $reply_to) {
+	$reply_to =~ s/^\s+|\s+$//g;
+	($reply_to) = expand_aliases($reply_to);
+	$reply_to = sanitize_address($reply_to);
 }
 
 if (!defined $smtp_server) {
@@ -902,7 +960,7 @@ if ($compose && $compose > 0) {
 }
 
 # Variables we set as part of the loop over files
-our ($message_id, %mail, $subject, $reply_to, $references, $message,
+our ($message_id, %mail, $subject, $in_reply_to, $references, $message,
 	$needs_confirm, $message_num, $ask_default);
 
 sub extract_valid_address {
@@ -1143,10 +1201,8 @@ sub valid_fqdn {
 sub maildomain_net {
 	my $maildomain;
 
-	if (eval { require Net::Domain; 1 }) {
-		my $domain = Net::Domain::domainname();
-		$maildomain = $domain if valid_fqdn($domain);
-	}
+	my $domain = Net::Domain::domainname();
+	$maildomain = $domain if valid_fqdn($domain);
 
 	return $maildomain;
 }
@@ -1154,17 +1210,15 @@ sub maildomain_net {
 sub maildomain_mta {
 	my $maildomain;
 
-	if (eval { require Net::SMTP; 1 }) {
-		for my $host (qw(mailhost localhost)) {
-			my $smtp = Net::SMTP->new($host);
-			if (defined $smtp) {
-				my $domain = $smtp->domain;
-				$smtp->quit;
+	for my $host (qw(mailhost localhost)) {
+		my $smtp = Net::SMTP->new($host);
+		if (defined $smtp) {
+			my $domain = $smtp->domain;
+			$smtp->quit;
 
-				$maildomain = $domain if valid_fqdn($domain);
+			$maildomain = $domain if valid_fqdn($domain);
 
-				last if $maildomain;
-			}
+			last if $maildomain;
 		}
 	}
 
@@ -1311,11 +1365,14 @@ Message-Id: $message_id
 	if ($use_xmailer) {
 		$header .= "X-Mailer: git-send-email $gitversion\n";
 	}
-	if ($reply_to) {
+	if ($in_reply_to) {
 
-		$header .= "In-Reply-To: $reply_to\n";
+		$header .= "In-Reply-To: $in_reply_to\n";
 		$header .= "References: $references\n";
 	}
+	if ($reply_to) {
+		$header .= "Reply-To: $reply_to\n";
+	}
 	if (@xh) {
 		$header .= join("\n", @xh) . "\n";
 	}
@@ -1490,8 +1547,8 @@ EOF
 	return 1;
 }
 
-$reply_to = $initial_reply_to;
-$references = $initial_reply_to || '';
+$in_reply_to = $initial_in_reply_to;
+$references = $initial_in_reply_to || '';
 $subject = $initial_subject;
 $message_num = 0;
 
@@ -1701,9 +1758,9 @@ foreach my $t (@files) {
 
 	# set up for the next message
 	if ($thread && $message_was_sent &&
-		($chain_reply_to || !defined $reply_to || length($reply_to) == 0 ||
+		($chain_reply_to || !defined $in_reply_to || length($in_reply_to) == 0 ||
 		$message_num == 1)) {
-		$reply_to = $message_id;
+		$in_reply_to = $message_id;
 		if (length $references > 0) {
 			$references .= "\n $message_id";
 		} else {
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 1ef1889..9d065fb 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,15 +17,15 @@ export TEXTDOMAINDIR
 
 # First decide what scheme to use...
 GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "@@USE_GETTEXT_SCHEME@@"
+if test -n "$GIT_GETTEXT_POISON"
+then
+	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+elif test -n "@@USE_GETTEXT_SCHEME@@"
 then
 	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
 elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 then
 	: no probing necessary
-elif test -n "$GIT_GETTEXT_POISON"
-then
-	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
 elif type gettext.sh >/dev/null 2>&1
 then
 	# GNU libintl's gettext.sh
diff --git a/git-stash.sh b/git-stash.sh
index fc8f8ae..94793c1 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -39,7 +39,7 @@ fi
 no_changes () {
 	git diff-index --quiet --cached HEAD --ignore-submodules -- "$@" &&
 	git diff-files --quiet --ignore-submodules -- "$@" &&
-	(test -z "$untracked" || test -z "$(untracked_files)")
+	(test -z "$untracked" || test -z "$(untracked_files "$@")")
 }
 
 untracked_files () {
@@ -315,16 +315,18 @@ push_stash () {
 	if test -z "$patch_mode"
 	then
 		test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
-		if test -n "$untracked"
+		if test -n "$untracked" && test $# = 0
 		then
-			git clean --force --quiet -d $CLEAN_X_OPTION -- "$@"
+			git clean --force --quiet -d $CLEAN_X_OPTION
 		fi
 
 		if test $# != 0
 		then
-			git add -u -- "$@" |
-			git checkout-index -z --force --stdin
-			git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R
+			test -z "$untracked" && UPDATE_OPTION="-u" || UPDATE_OPTION=
+			test "$untracked" = "all" && FORCE_OPTION="--force" || FORCE_OPTION=
+			git add $UPDATE_OPTION $FORCE_OPTION -- "$@"
+			git diff-index -p --cached --binary HEAD -- "$@" |
+			git apply --index -R
 		else
 			git reset --hard -q
 		fi
diff --git a/git.c b/git.c
index c870b97..3a89893 100644
--- a/git.c
+++ b/git.c
@@ -4,12 +4,30 @@
 #include "help.h"
 #include "run-command.h"
 
+#define RUN_SETUP		(1<<0)
+#define RUN_SETUP_GENTLY	(1<<1)
+#define USE_PAGER		(1<<2)
+/*
+ * require working tree to be present -- anything uses this needs
+ * RUN_SETUP for reading from the configuration file.
+ */
+#define NEED_WORK_TREE		(1<<3)
+#define SUPPORT_SUPER_PREFIX	(1<<4)
+#define DELAY_PAGER_CONFIG	(1<<5)
+#define NO_PARSEOPT		(1<<6) /* parse-options is not used */
+
+struct cmd_struct {
+	const char *cmd;
+	int (*fn)(int, const char **, const char *);
+	unsigned int option;
+};
+
 const char git_usage_string[] =
-	"git [--version] [--help] [-C <path>] [-c name=value]\n"
-	"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-	"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
-	"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-	"           <command> [<args>]";
+	N_("git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+	   "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+	   "           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+	   "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+	   "           <command> [<args>]");
 
 const char git_more_info_string[] =
 	N_("'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -18,7 +36,7 @@ const char git_more_info_string[] =
 
 static int use_pager = -1;
 
-static void list_builtins(void);
+static void list_builtins(unsigned int exclude_option, char sep);
 
 static void commit_pager_choice(void) {
 	switch (use_pager) {
@@ -92,7 +110,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "--git-dir")) {
 			if (*argc < 2) {
-				fprintf(stderr, "No directory given for --git-dir.\n" );
+				fprintf(stderr, _("no directory given for --git-dir\n" ));
 				usage(git_usage_string);
 			}
 			setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
@@ -106,7 +124,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "--namespace")) {
 			if (*argc < 2) {
-				fprintf(stderr, "No namespace given for --namespace.\n" );
+				fprintf(stderr, _("no namespace given for --namespace\n" ));
 				usage(git_usage_string);
 			}
 			setenv(GIT_NAMESPACE_ENVIRONMENT, (*argv)[1], 1);
@@ -120,7 +138,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "--work-tree")) {
 			if (*argc < 2) {
-				fprintf(stderr, "No directory given for --work-tree.\n" );
+				fprintf(stderr, _("no directory given for --work-tree\n" ));
 				usage(git_usage_string);
 			}
 			setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
@@ -134,7 +152,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "--super-prefix")) {
 			if (*argc < 2) {
-				fprintf(stderr, "No prefix given for --super-prefix.\n" );
+				fprintf(stderr, _("no prefix given for --super-prefix\n" ));
 				usage(git_usage_string);
 			}
 			setenv(GIT_SUPER_PREFIX_ENVIRONMENT, (*argv)[1], 1);
@@ -156,7 +174,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "-c")) {
 			if (*argc < 2) {
-				fprintf(stderr, "-c expects a configuration string\n" );
+				fprintf(stderr, _("-c expects a configuration string\n" ));
 				usage(git_usage_string);
 			}
 			git_config_push_parameter((*argv)[1]);
@@ -194,22 +212,25 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "-C")) {
 			if (*argc < 2) {
-				fprintf(stderr, "No directory given for -C.\n" );
+				fprintf(stderr, _("no directory given for -C\n" ));
 				usage(git_usage_string);
 			}
 			if ((*argv)[1][0]) {
 				if (chdir((*argv)[1]))
-					die_errno("Cannot change to '%s'", (*argv)[1]);
+					die_errno("cannot change to '%s'", (*argv)[1]);
 				if (envchanged)
 					*envchanged = 1;
 			}
 			(*argv)++;
 			(*argc)--;
 		} else if (!strcmp(cmd, "--list-builtins")) {
-			list_builtins();
+			list_builtins(0, '\n');
+			exit(0);
+		} else if (!strcmp(cmd, "--list-parseopt-builtins")) {
+			list_builtins(NO_PARSEOPT, ' ');
 			exit(0);
 		} else {
-			fprintf(stderr, "Unknown option: %s\n", cmd);
+			fprintf(stderr, _("unknown option: %s\n"), cmd);
 			usage(git_usage_string);
 		}
 
@@ -247,7 +268,7 @@ static int handle_alias(int *argcp, const char ***argv)
 			if (ret >= 0)   /* normal exit */
 				exit(ret);
 
-			die_errno("While expanding alias '%s': '%s'",
+			die_errno("while expanding alias '%s': '%s'",
 			    alias_command, alias_string + 1);
 		}
 		count = split_cmdline(alias_string, &new_argv);
@@ -256,8 +277,8 @@ static int handle_alias(int *argcp, const char ***argv)
 			    split_cmdline_strerror(count));
 		option_count = handle_options(&new_argv, &count, &envchanged);
 		if (envchanged)
-			die("alias '%s' changes environment variables\n"
-				 "You can use '!git' in the alias to do this.",
+			die("alias '%s' changes environment variables.\n"
+				 "You can use '!git' in the alias to do this",
 				 alias_command);
 		memmove(new_argv - option_count, new_argv,
 				count * sizeof(char *));
@@ -288,23 +309,6 @@ static int handle_alias(int *argcp, const char ***argv)
 	return ret;
 }
 
-#define RUN_SETUP		(1<<0)
-#define RUN_SETUP_GENTLY	(1<<1)
-#define USE_PAGER		(1<<2)
-/*
- * require working tree to be present -- anything uses this needs
- * RUN_SETUP for reading from the configuration file.
- */
-#define NEED_WORK_TREE		(1<<3)
-#define SUPPORT_SUPER_PREFIX	(1<<4)
-#define DELAY_PAGER_CONFIG	(1<<5)
-
-struct cmd_struct {
-	const char *cmd;
-	int (*fn)(int, const char **, const char *);
-	int option;
-};
-
 static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 {
 	int status, help;
@@ -367,18 +371,18 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 static struct cmd_struct commands[] = {
 	{ "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
 	{ "am", cmd_am, RUN_SETUP | NEED_WORK_TREE },
-	{ "annotate", cmd_annotate, RUN_SETUP },
+	{ "annotate", cmd_annotate, RUN_SETUP | NO_PARSEOPT },
 	{ "apply", cmd_apply, RUN_SETUP_GENTLY },
 	{ "archive", cmd_archive, RUN_SETUP_GENTLY },
 	{ "bisect--helper", cmd_bisect__helper, RUN_SETUP },
 	{ "blame", cmd_blame, RUN_SETUP },
 	{ "branch", cmd_branch, RUN_SETUP | DELAY_PAGER_CONFIG },
-	{ "bundle", cmd_bundle, RUN_SETUP_GENTLY },
+	{ "bundle", cmd_bundle, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "cat-file", cmd_cat_file, RUN_SETUP },
 	{ "check-attr", cmd_check_attr, RUN_SETUP },
 	{ "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE },
 	{ "check-mailmap", cmd_check_mailmap, RUN_SETUP },
-	{ "check-ref-format", cmd_check_ref_format },
+	{ "check-ref-format", cmd_check_ref_format, NO_PARSEOPT  },
 	{ "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
 	{ "checkout-index", cmd_checkout_index,
 		RUN_SETUP | NEED_WORK_TREE},
@@ -388,30 +392,30 @@ static struct cmd_struct commands[] = {
 	{ "clone", cmd_clone },
 	{ "column", cmd_column, RUN_SETUP_GENTLY },
 	{ "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE },
-	{ "commit-tree", cmd_commit_tree, RUN_SETUP },
-	{ "config", cmd_config, RUN_SETUP_GENTLY },
+	{ "commit-tree", cmd_commit_tree, RUN_SETUP | NO_PARSEOPT },
+	{ "config", cmd_config, RUN_SETUP_GENTLY | DELAY_PAGER_CONFIG },
 	{ "count-objects", cmd_count_objects, RUN_SETUP },
-	{ "credential", cmd_credential, RUN_SETUP_GENTLY },
+	{ "credential", cmd_credential, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "describe", cmd_describe, RUN_SETUP },
-	{ "diff", cmd_diff },
-	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
-	{ "diff-index", cmd_diff_index, RUN_SETUP },
-	{ "diff-tree", cmd_diff_tree, RUN_SETUP },
+	{ "diff", cmd_diff, NO_PARSEOPT },
+	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+	{ "diff-index", cmd_diff_index, RUN_SETUP | NO_PARSEOPT },
+	{ "diff-tree", cmd_diff_tree, RUN_SETUP | NO_PARSEOPT },
 	{ "difftool", cmd_difftool, RUN_SETUP | NEED_WORK_TREE },
 	{ "fast-export", cmd_fast_export, RUN_SETUP },
 	{ "fetch", cmd_fetch, RUN_SETUP },
-	{ "fetch-pack", cmd_fetch_pack, RUN_SETUP },
+	{ "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT },
 	{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
 	{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
 	{ "format-patch", cmd_format_patch, RUN_SETUP },
 	{ "fsck", cmd_fsck, RUN_SETUP },
 	{ "fsck-objects", cmd_fsck, RUN_SETUP },
 	{ "gc", cmd_gc, RUN_SETUP },
-	{ "get-tar-commit-id", cmd_get_tar_commit_id },
+	{ "get-tar-commit-id", cmd_get_tar_commit_id, NO_PARSEOPT },
 	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
 	{ "hash-object", cmd_hash_object },
 	{ "help", cmd_help },
-	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
+	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "init", cmd_init_db },
 	{ "init-db", cmd_init_db },
 	{ "interpret-trailers", cmd_interpret_trailers, RUN_SETUP_GENTLY },
@@ -419,27 +423,27 @@ static struct cmd_struct commands[] = {
 	{ "ls-files", cmd_ls_files, RUN_SETUP },
 	{ "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
 	{ "ls-tree", cmd_ls_tree, RUN_SETUP },
-	{ "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY },
-	{ "mailsplit", cmd_mailsplit },
+	{ "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY | NO_PARSEOPT },
+	{ "mailsplit", cmd_mailsplit, NO_PARSEOPT },
 	{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
 	{ "merge-base", cmd_merge_base, RUN_SETUP },
 	{ "merge-file", cmd_merge_file, RUN_SETUP_GENTLY },
-	{ "merge-index", cmd_merge_index, RUN_SETUP },
-	{ "merge-ours", cmd_merge_ours, RUN_SETUP },
-	{ "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
-	{ "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
-	{ "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
-	{ "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
-	{ "merge-tree", cmd_merge_tree, RUN_SETUP },
-	{ "mktag", cmd_mktag, RUN_SETUP },
+	{ "merge-index", cmd_merge_index, RUN_SETUP | NO_PARSEOPT },
+	{ "merge-ours", cmd_merge_ours, RUN_SETUP | NO_PARSEOPT },
+	{ "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+	{ "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+	{ "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+	{ "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+	{ "merge-tree", cmd_merge_tree, RUN_SETUP | NO_PARSEOPT },
+	{ "mktag", cmd_mktag, RUN_SETUP | NO_PARSEOPT },
 	{ "mktree", cmd_mktree, RUN_SETUP },
 	{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
 	{ "name-rev", cmd_name_rev, RUN_SETUP },
 	{ "notes", cmd_notes, RUN_SETUP },
 	{ "pack-objects", cmd_pack_objects, RUN_SETUP },
-	{ "pack-redundant", cmd_pack_redundant, RUN_SETUP },
+	{ "pack-redundant", cmd_pack_redundant, RUN_SETUP | NO_PARSEOPT },
 	{ "pack-refs", cmd_pack_refs, RUN_SETUP },
-	{ "patch-id", cmd_patch_id, RUN_SETUP_GENTLY },
+	{ "patch-id", cmd_patch_id, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "pickaxe", cmd_blame, RUN_SETUP },
 	{ "prune", cmd_prune, RUN_SETUP },
 	{ "prune-packed", cmd_prune_packed, RUN_SETUP },
@@ -450,14 +454,14 @@ static struct cmd_struct commands[] = {
 	{ "receive-pack", cmd_receive_pack },
 	{ "reflog", cmd_reflog, RUN_SETUP },
 	{ "remote", cmd_remote, RUN_SETUP },
-	{ "remote-ext", cmd_remote_ext },
-	{ "remote-fd", cmd_remote_fd },
+	{ "remote-ext", cmd_remote_ext, NO_PARSEOPT },
+	{ "remote-fd", cmd_remote_fd, NO_PARSEOPT },
 	{ "repack", cmd_repack, RUN_SETUP },
 	{ "replace", cmd_replace, RUN_SETUP },
 	{ "rerere", cmd_rerere, RUN_SETUP },
 	{ "reset", cmd_reset, RUN_SETUP },
-	{ "rev-list", cmd_rev_list, RUN_SETUP },
-	{ "rev-parse", cmd_rev_parse },
+	{ "rev-list", cmd_rev_list, RUN_SETUP | NO_PARSEOPT },
+	{ "rev-parse", cmd_rev_parse, NO_PARSEOPT },
 	{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
 	{ "rm", cmd_rm, RUN_SETUP },
 	{ "send-pack", cmd_send_pack, RUN_SETUP },
@@ -468,23 +472,23 @@ static struct cmd_struct commands[] = {
 	{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
 	{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
 	{ "stripspace", cmd_stripspace },
-	{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX},
+	{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX | NO_PARSEOPT },
 	{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
 	{ "tag", cmd_tag, RUN_SETUP | DELAY_PAGER_CONFIG },
-	{ "unpack-file", cmd_unpack_file, RUN_SETUP },
-	{ "unpack-objects", cmd_unpack_objects, RUN_SETUP },
+	{ "unpack-file", cmd_unpack_file, RUN_SETUP | NO_PARSEOPT },
+	{ "unpack-objects", cmd_unpack_objects, RUN_SETUP | NO_PARSEOPT },
 	{ "update-index", cmd_update_index, RUN_SETUP },
 	{ "update-ref", cmd_update_ref, RUN_SETUP },
 	{ "update-server-info", cmd_update_server_info, RUN_SETUP },
-	{ "upload-archive", cmd_upload_archive },
-	{ "upload-archive--writer", cmd_upload_archive_writer },
-	{ "var", cmd_var, RUN_SETUP_GENTLY },
+	{ "upload-archive", cmd_upload_archive, NO_PARSEOPT },
+	{ "upload-archive--writer", cmd_upload_archive_writer, NO_PARSEOPT },
+	{ "var", cmd_var, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "verify-commit", cmd_verify_commit, RUN_SETUP },
 	{ "verify-pack", cmd_verify_pack },
 	{ "verify-tag", cmd_verify_tag, RUN_SETUP },
 	{ "version", cmd_version },
 	{ "whatchanged", cmd_whatchanged, RUN_SETUP },
-	{ "worktree", cmd_worktree, RUN_SETUP },
+	{ "worktree", cmd_worktree, RUN_SETUP | NO_PARSEOPT },
 	{ "write-tree", cmd_write_tree, RUN_SETUP },
 };
 
@@ -504,11 +508,15 @@ int is_builtin(const char *s)
 	return !!get_builtin(s);
 }
 
-static void list_builtins(void)
+static void list_builtins(unsigned int exclude_option, char sep)
 {
 	int i;
-	for (i = 0; i < ARRAY_SIZE(commands); i++)
-		printf("%s\n", commands[i].cmd);
+	for (i = 0; i < ARRAY_SIZE(commands); i++) {
+		if (exclude_option &&
+		    (commands[i].option & exclude_option))
+			continue;
+		printf("%s%c", commands[i].cmd, sep);
+	}
 }
 
 #ifdef STRIP_EXTENSION
@@ -684,8 +692,8 @@ int cmd_main(int argc, const char **argv)
 		if (errno != ENOENT)
 			break;
 		if (was_alias) {
-			fprintf(stderr, "Expansion of alias '%s' failed; "
-				"'%s' is not a git command\n",
+			fprintf(stderr, _("expansion of alias '%s' failed; "
+					  "'%s' is not a git command\n"),
 				cmd, argv[0]);
 			exit(1);
 		}
@@ -696,7 +704,7 @@ int cmd_main(int argc, const char **argv)
 			break;
 	}
 
-	fprintf(stderr, "Failed to run command '%s': %s\n",
+	fprintf(stderr, _("failed to run command '%s': %s\n"),
 		cmd, strerror(errno));
 
 	return 1;
diff --git a/gitweb/INSTALL b/gitweb/INSTALL
index 408f285..a58e6b3 100644
--- a/gitweb/INSTALL
+++ b/gitweb/INSTALL
@@ -29,12 +29,11 @@ Requirements
 ------------
 
  - Core git tools
- - Perl
+ - Perl 5.8
  - Perl modules: CGI, Encode, Fcntl, File::Find, File::Basename.
  - web server
 
 The following optional Perl modules are required for extra features
- - Digest::MD5 - for gravatar support
  - CGI::Fast and FCGI - for running gitweb as FastCGI script
  - HTML::TagCloud - for fancy tag cloud in project list view
  - HTTP::Date or Time::ParseDate - to support If-Modified-Since for feeds
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 2417057..2594a4b 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -20,6 +20,8 @@ use Fcntl ':mode';
 use File::Find qw();
 use File::Basename qw(basename);
 use Time::HiRes qw(gettimeofday tv_interval);
+use Digest::MD5 qw(md5_hex);
+
 binmode STDOUT, ':utf8';
 
 if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
@@ -490,7 +492,6 @@ our %feature = (
 	# Currently available providers are gravatar and picon.
 	# If an unknown provider is specified, the feature is disabled.
 
-	# Gravatar depends on Digest::MD5.
 	# Picon currently relies on the indiana.edu database.
 
 	# To enable system wide have in $GITWEB_CONFIG
@@ -1166,18 +1167,8 @@ sub configure_gitweb_features {
 	our @snapshot_fmts = gitweb_get_feature('snapshot');
 	@snapshot_fmts = filter_snapshot_fmts(@snapshot_fmts);
 
-	# check that the avatar feature is set to a known provider name,
-	# and for each provider check if the dependencies are satisfied.
-	# if the provider name is invalid or the dependencies are not met,
-	# reset $git_avatar to the empty string.
 	our ($git_avatar) = gitweb_get_feature('avatar');
-	if ($git_avatar eq 'gravatar') {
-		$git_avatar = '' unless (eval { require Digest::MD5; 1; });
-	} elsif ($git_avatar eq 'picon') {
-		# no dependencies
-	} else {
-		$git_avatar = '';
-	}
+	$git_avatar = '' unless $git_avatar =~ /^(?:gravatar|picon)$/s;
 
 	our @extra_branch_refs = gitweb_get_feature('extra-branch-refs');
 	@extra_branch_refs = filter_and_validate_refs (@extra_branch_refs);
@@ -2167,7 +2158,7 @@ sub gravatar_url {
 	my $size = shift;
 	$avatar_cache{$email} ||=
 		"//www.gravatar.com/avatar/" .
-			Digest::MD5::md5_hex($email) . "?s=";
+			md5_hex($email) . "?s=";
 	return $avatar_cache{$email} . $size;
 }
 
diff --git a/grep.c b/grep.c
index 3d7cd0e..65b90c1 100644
--- a/grep.c
+++ b/grep.c
@@ -18,6 +18,11 @@ static void std_output(struct grep_opt *opt, const void *buf, size_t size)
 	fwrite(buf, size, 1, stdout);
 }
 
+static void color_set(char *dst, const char *color_bytes)
+{
+	xsnprintf(dst, COLOR_MAXLEN, "%s", color_bytes);
+}
+
 /*
  * Initialize the grep_defaults template with hardcoded defaults.
  * We could let the compiler do this, but without C99 initializers
@@ -2010,7 +2015,7 @@ static int grep_source_load_oid(struct grep_source *gs)
 	enum object_type type;
 
 	grep_read_lock();
-	gs->buf = read_sha1_file(gs->identifier, &type, &gs->size);
+	gs->buf = read_object_file(gs->identifier, &type, &gs->size);
 	grep_read_unlock();
 
 	if (!gs->buf)
diff --git a/hash.h b/hash.h
index 7d7a864..7c8238b 100644
--- a/hash.h
+++ b/hash.h
@@ -15,6 +15,31 @@
 #include "block-sha1/sha1.h"
 #endif
 
+#ifndef platform_SHA_CTX
+/*
+ * platform's underlying implementation of SHA-1; could be OpenSSL,
+ * blk_SHA, Apple CommonCrypto, etc...  Note that the relevant
+ * SHA-1 header may have already defined platform_SHA_CTX for our
+ * own implementations like block-sha1 and ppc-sha1, so we list
+ * the default for OpenSSL compatible SHA-1 implementations here.
+ */
+#define platform_SHA_CTX	SHA_CTX
+#define platform_SHA1_Init	SHA1_Init
+#define platform_SHA1_Update	SHA1_Update
+#define platform_SHA1_Final    	SHA1_Final
+#endif
+
+#define git_SHA_CTX		platform_SHA_CTX
+#define git_SHA1_Init		platform_SHA1_Init
+#define git_SHA1_Update		platform_SHA1_Update
+#define git_SHA1_Final		platform_SHA1_Final
+
+#ifdef SHA1_MAX_BLOCK_SIZE
+#include "compat/sha1-chunked.h"
+#undef git_SHA1_Update
+#define git_SHA1_Update		git_SHA1_Update_Chunked
+#endif
+
 /*
  * Note that these constants are suitable for indexing the hash_algos array and
  * comparing against each other, but are otherwise arbitrary, so they should not
@@ -30,9 +55,15 @@
 /* Number of algorithms supported (including unknown). */
 #define GIT_HASH_NALGOS (GIT_HASH_SHA1 + 1)
 
-typedef void (*git_hash_init_fn)(void *ctx);
-typedef void (*git_hash_update_fn)(void *ctx, const void *in, size_t len);
-typedef void (*git_hash_final_fn)(unsigned char *hash, void *ctx);
+/* A suitably aligned type for stack allocations of hash contexts. */
+union git_hash_ctx {
+	git_SHA_CTX sha1;
+};
+typedef union git_hash_ctx git_hash_ctx;
+
+typedef void (*git_hash_init_fn)(git_hash_ctx *ctx);
+typedef void (*git_hash_update_fn)(git_hash_ctx *ctx, const void *in, size_t len);
+typedef void (*git_hash_final_fn)(unsigned char *hash, git_hash_ctx *ctx);
 
 struct git_hash_algo {
 	/*
@@ -44,9 +75,6 @@ struct git_hash_algo {
 	/* A four-byte version identifier, used in pack indices. */
 	uint32_t format_id;
 
-	/* The size of a hash context (e.g. git_SHA_CTX). */
-	size_t ctxsz;
-
 	/* The length of the hash in binary. */
 	size_t rawsz;
 
diff --git a/http-push.c b/http-push.c
index 97fe22a..c0998fd 100644
--- a/http-push.c
+++ b/http-push.c
@@ -362,8 +362,8 @@ static void start_put(struct transfer_request *request)
 	ssize_t size;
 	git_zstream stream;
 
-	unpacked = read_sha1_file(request->obj->oid.hash, &type, &len);
-	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), len) + 1;
+	unpacked = read_object_file(&request->obj->oid, &type, &len);
+	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), len) + 1;
 
 	/* Set it up */
 	git_deflate_init(&stream, zlib_compression_level);
diff --git a/http-walker.c b/http-walker.c
index 75d55d4..7cdfb2f 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -24,7 +24,7 @@ enum object_request_state {
 
 struct object_request {
 	struct walker *walker;
-	unsigned char sha1[20];
+	struct object_id oid;
 	struct alt_base *repo;
 	enum object_request_state state;
 	struct http_object_request *req;
@@ -58,7 +58,7 @@ static void start_object_request(struct walker *walker,
 	struct active_request_slot *slot;
 	struct http_object_request *req;
 
-	req = new_http_object_request(obj_req->repo->base, obj_req->sha1);
+	req = new_http_object_request(obj_req->repo->base, obj_req->oid.hash);
 	if (req == NULL) {
 		obj_req->state = ABORTED;
 		return;
@@ -84,7 +84,7 @@ static void finish_object_request(struct object_request *obj_req)
 		return;
 
 	if (obj_req->req->rename == 0)
-		walker_say(obj_req->walker, "got %s\n", sha1_to_hex(obj_req->sha1));
+		walker_say(obj_req->walker, "got %s\n", oid_to_hex(&obj_req->oid));
 }
 
 static void process_object_response(void *callback_data)
@@ -131,7 +131,7 @@ static int fill_active_slot(struct walker *walker)
 	list_for_each_safe(pos, tmp, head) {
 		obj_req = list_entry(pos, struct object_request, node);
 		if (obj_req->state == WAITING) {
-			if (has_sha1_file(obj_req->sha1))
+			if (has_sha1_file(obj_req->oid.hash))
 				obj_req->state = COMPLETE;
 			else {
 				start_object_request(walker, obj_req);
@@ -150,7 +150,7 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
 
 	newreq = xmalloc(sizeof(*newreq));
 	newreq->walker = walker;
-	hashcpy(newreq->sha1, sha1);
+	hashcpy(newreq->oid.hash, sha1);
 	newreq->repo = data->alt;
 	newreq->state = WAITING;
 	newreq->req = NULL;
@@ -483,13 +483,13 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
 
 	list_for_each(pos, head) {
 		obj_req = list_entry(pos, struct object_request, node);
-		if (!hashcmp(obj_req->sha1, sha1))
+		if (!hashcmp(obj_req->oid.hash, sha1))
 			break;
 	}
 	if (obj_req == NULL)
 		return error("Couldn't find request for %s in the queue", hex);
 
-	if (has_sha1_file(obj_req->sha1)) {
+	if (has_sha1_file(obj_req->oid.hash)) {
 		if (obj_req->req != NULL)
 			abort_http_object_request(obj_req->req);
 		abort_object_request(obj_req);
@@ -543,7 +543,7 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
 	} else if (req->zret != Z_STREAM_END) {
 		walker->corrupt_object_found++;
 		ret = error("File %s (%s) corrupt", hex, req->url);
-	} else if (hashcmp(obj_req->sha1, req->real_sha1)) {
+	} else if (hashcmp(obj_req->oid.hash, req->real_sha1)) {
 		ret = error("File %s has bad hash", hex);
 	} else if (req->rename < 0) {
 		struct strbuf buf = STRBUF_INIT;
diff --git a/http.c b/http.c
index 4d613d5..9304045 100644
--- a/http.c
+++ b/http.c
@@ -70,6 +70,9 @@ static const char *ssl_key;
 #if LIBCURL_VERSION_NUM >= 0x070908
 static const char *ssl_capath;
 #endif
+#if LIBCURL_VERSION_NUM >= 0x071304
+static const char *curl_no_proxy;
+#endif
 #if LIBCURL_VERSION_NUM >= 0x072c00
 static const char *ssl_pinnedkey;
 #endif
@@ -78,7 +81,6 @@ static long curl_low_speed_limit = -1;
 static long curl_low_speed_time = -1;
 static int curl_ftp_no_epsv;
 static const char *curl_http_proxy;
-static const char *curl_no_proxy;
 static const char *http_proxy_authmethod;
 static struct {
 	const char *name;
@@ -1261,14 +1263,14 @@ static struct fill_chain *fill_cfg;
 
 void add_fill_function(void *data, int (*fill)(void *))
 {
-	struct fill_chain *new = xmalloc(sizeof(*new));
+	struct fill_chain *new_fill = xmalloc(sizeof(*new_fill));
 	struct fill_chain **linkp = &fill_cfg;
-	new->data = data;
-	new->fill = fill;
-	new->next = NULL;
+	new_fill->data = data;
+	new_fill->fill = fill;
+	new_fill->next = NULL;
 	while (*linkp)
 		linkp = &(*linkp)->next;
-	*linkp = new;
+	*linkp = new_fill;
 }
 
 void fill_active_slots(void)
diff --git a/imap-send.c b/imap-send.c
index 36c7c1b..ffb0a6e 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1189,11 +1189,11 @@ bail:
  */
 static void lf_to_crlf(struct strbuf *msg)
 {
-	char *new;
+	char *new_msg;
 	size_t i, j;
 	char lastc;
 
-	/* First pass: tally, in j, the size of the new string: */
+	/* First pass: tally, in j, the size of the new_msg string: */
 	for (i = j = 0, lastc = '\0'; i < msg->len; i++) {
 		if (msg->buf[i] == '\n' && lastc != '\r')
 			j++; /* a CR will need to be added here */
@@ -1201,18 +1201,18 @@ static void lf_to_crlf(struct strbuf *msg)
 		j++;
 	}
 
-	new = xmallocz(j);
+	new_msg = xmallocz(j);
 
 	/*
-	 * Second pass: write the new string.  Note that this loop is
+	 * Second pass: write the new_msg string.  Note that this loop is
 	 * otherwise identical to the first pass.
 	 */
 	for (i = j = 0, lastc = '\0'; i < msg->len; i++) {
 		if (msg->buf[i] == '\n' && lastc != '\r')
-			new[j++] = '\r';
-		lastc = new[j++] = msg->buf[i];
+			new_msg[j++] = '\r';
+		lastc = new_msg[j++] = msg->buf[i];
 	}
-	strbuf_attach(msg, new, j, j + 1);
+	strbuf_attach(msg, new_msg, j, j + 1);
 }
 
 /*
diff --git a/line-log.c b/line-log.c
index 545ad0f..ecdce08 100644
--- a/line-log.c
+++ b/line-log.c
@@ -151,29 +151,29 @@ static void range_set_union(struct range_set *out,
 
 	assert(out->nr == 0);
 	while (i < a->nr || j < b->nr) {
-		struct range *new;
+		struct range *new_range;
 		if (i < a->nr && j < b->nr) {
 			if (ra[i].start < rb[j].start)
-				new = &ra[i++];
+				new_range = &ra[i++];
 			else if (ra[i].start > rb[j].start)
-				new = &rb[j++];
+				new_range = &rb[j++];
 			else if (ra[i].end < rb[j].end)
-				new = &ra[i++];
+				new_range = &ra[i++];
 			else
-				new = &rb[j++];
+				new_range = &rb[j++];
 		} else if (i < a->nr)      /* b exhausted */
-			new = &ra[i++];
+			new_range = &ra[i++];
 		else                       /* a exhausted */
-			new = &rb[j++];
-		if (new->start == new->end)
+			new_range = &rb[j++];
+		if (new_range->start == new_range->end)
 			; /* empty range */
-		else if (!out->nr || out->ranges[out->nr-1].end < new->start) {
+		else if (!out->nr || out->ranges[out->nr-1].end < new_range->start) {
 			range_set_grow(out, 1);
-			out->ranges[out->nr].start = new->start;
-			out->ranges[out->nr].end = new->end;
+			out->ranges[out->nr].start = new_range->start;
+			out->ranges[out->nr].end = new_range->end;
 			out->nr++;
-		} else if (out->ranges[out->nr-1].end < new->end) {
-			out->ranges[out->nr-1].end = new->end;
+		} else if (out->ranges[out->nr-1].end < new_range->end) {
+			out->ranges[out->nr-1].end = new_range->end;
 		}
 	}
 }
@@ -501,8 +501,7 @@ static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
 	unsigned mode;
 	struct object_id oid;
 
-	if (get_tree_entry(commit->object.oid.hash, spec->path,
-			   oid.hash, &mode))
+	if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))
 		die("There is no path %s in the commit", spec->path);
 	fill_filespec(spec, &oid, 1, mode);
 
@@ -696,18 +695,18 @@ static struct line_log_data *line_log_data_merge(struct line_log_data *a,
 static void add_line_range(struct rev_info *revs, struct commit *commit,
 			   struct line_log_data *range)
 {
-	struct line_log_data *old = NULL;
-	struct line_log_data *new = NULL;
+	struct line_log_data *old_line = NULL;
+	struct line_log_data *new_line = NULL;
 
-	old = lookup_decoration(&revs->line_log_data, &commit->object);
-	if (old && range) {
-		new = line_log_data_merge(old, range);
-		free_line_log_data(old);
+	old_line = lookup_decoration(&revs->line_log_data, &commit->object);
+	if (old_line && range) {
+		new_line = line_log_data_merge(old_line, range);
+		free_line_log_data(old_line);
 	} else if (range)
-		new = line_log_data_copy(range);
+		new_line = line_log_data_copy(range);
 
-	if (new)
-		add_decoration(&revs->line_log_data, &commit->object, new);
+	if (new_line)
+		add_decoration(&revs->line_log_data, &commit->object, new_line);
 }
 
 static void clear_commit_line_range(struct rev_info *revs, struct commit *commit)
@@ -1042,12 +1041,12 @@ static int process_diff_filepair(struct rev_info *rev,
 
 static struct diff_filepair *diff_filepair_dup(struct diff_filepair *pair)
 {
-	struct diff_filepair *new = xmalloc(sizeof(struct diff_filepair));
-	new->one = pair->one;
-	new->two = pair->two;
-	new->one->count++;
-	new->two->count++;
-	return new;
+	struct diff_filepair *new_filepair = xmalloc(sizeof(struct diff_filepair));
+	new_filepair->one = pair->one;
+	new_filepair->two = pair->two;
+	new_filepair->one->count++;
+	new_filepair->two->count++;
+	return new_filepair;
 }
 
 static void free_diffqueues(int n, struct diff_queue_struct *dq)
diff --git a/list-objects-filter.c b/list-objects-filter.c
index 4356c45..0ec83aa 100644
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -117,7 +117,7 @@ static enum list_objects_filter_result filter_blobs_limit(
 		assert(obj->type == OBJ_BLOB);
 		assert((obj->flags & SEEN) == 0);
 
-		t = sha1_object_info(obj->oid.hash, &object_length);
+		t = oid_object_info(&obj->oid, &object_length);
 		if (t != OBJ_BLOB) { /* probably OBJ_NONE */
 			/*
 			 * We DO NOT have the blob locally, so we cannot
diff --git a/log-tree.c b/log-tree.c
index fca29d4..d1c0bed 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -177,7 +177,7 @@ static void show_parents(struct commit *commit, int abbrev, FILE *file)
 	struct commit_list *p;
 	for (p = commit->parents; p ; p = p->next) {
 		struct commit *parent = p->item;
-		fprintf(file, " %s", find_unique_abbrev(parent->object.oid.hash, abbrev));
+		fprintf(file, " %s", find_unique_abbrev(&parent->object.oid, abbrev));
 	}
 }
 
@@ -185,7 +185,7 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre
 {
 	struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
 	for ( ; p; p = p->next) {
-		fprintf(opt->diffopt.file, " %s", find_unique_abbrev(p->item->object.oid.hash, abbrev));
+		fprintf(opt->diffopt.file, " %s", find_unique_abbrev(&p->item->object.oid, abbrev));
 	}
 }
 
@@ -499,7 +499,7 @@ static void show_one_mergetag(struct commit *commit,
 	int status, nth;
 	size_t payload_size, gpg_message_offset;
 
-	hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), oid.hash);
+	hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid);
 	tag = lookup_tag(&oid);
 	if (!tag)
 		return; /* error message already given */
@@ -558,7 +558,7 @@ void show_log(struct rev_info *opt)
 
 		if (!opt->graph)
 			put_revision_mark(opt, commit);
-		fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit), opt->diffopt.file);
+		fputs(find_unique_abbrev(&commit->object.oid, abbrev_commit), opt->diffopt.file);
 		if (opt->print_parents)
 			show_parents(commit, abbrev_commit, opt->diffopt.file);
 		if (opt->children.name)
@@ -620,7 +620,8 @@ void show_log(struct rev_info *opt)
 
 		if (!opt->graph)
 			put_revision_mark(opt, commit);
-		fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit),
+		fputs(find_unique_abbrev(&commit->object.oid,
+					 abbrev_commit),
 		      opt->diffopt.file);
 		if (opt->print_parents)
 			show_parents(commit, abbrev_commit, opt->diffopt.file);
@@ -628,8 +629,7 @@ void show_log(struct rev_info *opt)
 			show_children(opt, commit, abbrev_commit);
 		if (parent)
 			fprintf(opt->diffopt.file, " (from %s)",
-			       find_unique_abbrev(parent->object.oid.hash,
-						  abbrev_commit));
+			       find_unique_abbrev(&parent->object.oid, abbrev_commit));
 		fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
 		show_decorations(opt, commit);
 		if (opt->commit_format == CMIT_FMT_ONELINE) {
@@ -659,9 +659,6 @@ void show_log(struct rev_info *opt)
 		show_mergetag(opt, commit);
 	}
 
-	if (!get_cached_commit_buffer(commit, NULL))
-		return;
-
 	if (opt->show_notes) {
 		int raw;
 		struct strbuf notebuf = STRBUF_INIT;
diff --git a/mailmap.c b/mailmap.c
index cb921b4..13f0d28 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -224,7 +224,7 @@ static int read_mailmap_blob(struct string_list *map,
 	if (get_oid(name, &oid) < 0)
 		return 0;
 
-	buf = read_sha1_file(oid.hash, &type, &size);
+	buf = read_object_file(&oid, &type, &size);
 	if (!buf)
 		return error("unable to read mailmap object at %s", name);
 	if (type != OBJ_BLOB)
diff --git a/match-trees.c b/match-trees.c
index 396b733..72cc2ba 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -54,7 +54,7 @@ static void *fill_tree_desc_strict(struct tree_desc *desc,
 	enum object_type type;
 	unsigned long size;
 
-	buffer = read_sha1_file(hash->hash, &type, &size);
+	buffer = read_object_file(hash, &type, &size);
 	if (!buffer)
 		die("unable to read tree (%s)", oid_to_hex(hash));
 	if (type != OBJ_TREE)
@@ -158,22 +158,20 @@ static void match_trees(const struct object_id *hash1,
 }
 
 /*
- * A tree "hash1" has a subdirectory at "prefix".  Come up with a
- * tree object by replacing it with another tree "hash2".
+ * A tree "oid1" has a subdirectory at "prefix".  Come up with a tree object by
+ * replacing it with another tree "oid2".
  */
-static int splice_tree(const unsigned char *hash1,
-		       const char *prefix,
-		       const unsigned char *hash2,
-		       unsigned char *result)
+static int splice_tree(const struct object_id *oid1, const char *prefix,
+		       const struct object_id *oid2, struct object_id *result)
 {
 	char *subpath;
 	int toplen;
 	char *buf;
 	unsigned long sz;
 	struct tree_desc desc;
-	unsigned char *rewrite_here;
-	const unsigned char *rewrite_with;
-	unsigned char subtree[20];
+	struct object_id *rewrite_here;
+	const struct object_id *rewrite_with;
+	struct object_id subtree;
 	enum object_type type;
 	int status;
 
@@ -182,9 +180,9 @@ static int splice_tree(const unsigned char *hash1,
 	if (*subpath)
 		subpath++;
 
-	buf = read_sha1_file(hash1, &type, &sz);
+	buf = read_object_file(oid1, &type, &sz);
 	if (!buf)
-		die("cannot read tree %s", sha1_to_hex(hash1));
+		die("cannot read tree %s", oid_to_hex(oid1));
 	init_tree_desc(&desc, buf, sz);
 
 	rewrite_here = NULL;
@@ -197,26 +195,26 @@ static int splice_tree(const unsigned char *hash1,
 		if (strlen(name) == toplen &&
 		    !memcmp(name, prefix, toplen)) {
 			if (!S_ISDIR(mode))
-				die("entry %s in tree %s is not a tree",
-				    name, sha1_to_hex(hash1));
-			rewrite_here = (unsigned char *) oid->hash;
+				die("entry %s in tree %s is not a tree", name,
+				    oid_to_hex(oid1));
+			rewrite_here = (struct object_id *)oid;
 			break;
 		}
 		update_tree_entry(&desc);
 	}
 	if (!rewrite_here)
-		die("entry %.*s not found in tree %s",
-		    toplen, prefix, sha1_to_hex(hash1));
+		die("entry %.*s not found in tree %s", toplen, prefix,
+		    oid_to_hex(oid1));
 	if (*subpath) {
-		status = splice_tree(rewrite_here, subpath, hash2, subtree);
+		status = splice_tree(rewrite_here, subpath, oid2, &subtree);
 		if (status)
 			return status;
-		rewrite_with = subtree;
+		rewrite_with = &subtree;
+	} else {
+		rewrite_with = oid2;
 	}
-	else
-		rewrite_with = hash2;
-	hashcpy(rewrite_here, rewrite_with);
-	status = write_sha1_file(buf, sz, tree_type, result);
+	oidcpy(rewrite_here, rewrite_with);
+	status = write_object_file(buf, sz, tree_type, result);
 	free(buf);
 	return status;
 }
@@ -271,7 +269,7 @@ void shift_tree(const struct object_id *hash1,
 		if (!*del_prefix)
 			return;
 
-		if (get_tree_entry(hash2->hash, del_prefix, shifted->hash, &mode))
+		if (get_tree_entry(hash2, del_prefix, shifted, &mode))
 			die("cannot find path %s in tree %s",
 			    del_prefix, oid_to_hex(hash2));
 		return;
@@ -280,7 +278,7 @@ void shift_tree(const struct object_id *hash1,
 	if (!*add_prefix)
 		return;
 
-	splice_tree(hash1->hash, add_prefix, hash2->hash, shifted->hash);
+	splice_tree(hash1, add_prefix, hash2, shifted);
 }
 
 /*
@@ -298,12 +296,12 @@ void shift_tree_by(const struct object_id *hash1,
 	unsigned candidate = 0;
 
 	/* Can hash2 be a tree at shift_prefix in tree hash1? */
-	if (!get_tree_entry(hash1->hash, shift_prefix, sub1.hash, &mode1) &&
+	if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&
 	    S_ISDIR(mode1))
 		candidate |= 1;
 
 	/* Can hash1 be a tree at shift_prefix in tree hash2? */
-	if (!get_tree_entry(hash2->hash, shift_prefix, sub2.hash, &mode2) &&
+	if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&
 	    S_ISDIR(mode2))
 		candidate |= 2;
 
@@ -334,7 +332,7 @@ void shift_tree_by(const struct object_id *hash1,
 		 * shift tree2 down by adding shift_prefix above it
 		 * to match tree1.
 		 */
-		splice_tree(hash1->hash, shift_prefix, hash2->hash, shifted->hash);
+		splice_tree(hash1, shift_prefix, hash2, shifted);
 	else
 		/*
 		 * shift tree2 up by removing shift_prefix from it
diff --git a/merge-blobs.c b/merge-blobs.c
index 9b6eac2..fa49c17 100644
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -11,7 +11,7 @@ static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
 	unsigned long size;
 	enum object_type type;
 
-	buf = read_sha1_file(obj->object.oid.hash, &type, &size);
+	buf = read_object_file(&obj->object.oid, &type, &size);
 	if (!buf)
 		return -1;
 	if (type != OBJ_BLOB) {
@@ -66,7 +66,7 @@ void *merge_blobs(const char *path, struct blob *base, struct blob *our, struct
 			return NULL;
 		if (!our)
 			our = their;
-		return read_sha1_file(our->object.oid.hash, &type, size);
+		return read_object_file(&our->object.oid, &type, size);
 	}
 
 	if (fill_mmfile_blob(&f1, our) < 0)
diff --git a/merge-recursive.c b/merge-recursive.c
index cc5fa0a..9c05eb7 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -49,6 +49,67 @@ static unsigned int path_hash(const char *path)
 	return ignore_case ? strihash(path) : strhash(path);
 }
 
+static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
+						      char *dir)
+{
+	struct dir_rename_entry key;
+
+	if (dir == NULL)
+		return NULL;
+	hashmap_entry_init(&key, strhash(dir));
+	key.dir = dir;
+	return hashmap_get(hashmap, &key, NULL);
+}
+
+static int dir_rename_cmp(const void *unused_cmp_data,
+			  const void *entry,
+			  const void *entry_or_key,
+			  const void *unused_keydata)
+{
+	const struct dir_rename_entry *e1 = entry;
+	const struct dir_rename_entry *e2 = entry_or_key;
+
+	return strcmp(e1->dir, e2->dir);
+}
+
+static void dir_rename_init(struct hashmap *map)
+{
+	hashmap_init(map, dir_rename_cmp, NULL, 0);
+}
+
+static void dir_rename_entry_init(struct dir_rename_entry *entry,
+				  char *directory)
+{
+	hashmap_entry_init(entry, strhash(directory));
+	entry->dir = directory;
+	entry->non_unique_new_dir = 0;
+	strbuf_init(&entry->new_dir, 0);
+	string_list_init(&entry->possible_new_dirs, 0);
+}
+
+static struct collision_entry *collision_find_entry(struct hashmap *hashmap,
+						    char *target_file)
+{
+	struct collision_entry key;
+
+	hashmap_entry_init(&key, strhash(target_file));
+	key.target_file = target_file;
+	return hashmap_get(hashmap, &key, NULL);
+}
+
+static int collision_cmp(void *unused_cmp_data,
+			 const struct collision_entry *e1,
+			 const struct collision_entry *e2,
+			 const void *unused_keydata)
+{
+	return strcmp(e1->target_file, e2->target_file);
+}
+
+static void collision_init(struct hashmap *map)
+{
+	hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
+}
+
 static void flush_output(struct merge_options *o)
 {
 	if (o->buffer_output < 2 && o->obuf.len) {
@@ -119,6 +180,7 @@ static int oid_eq(const struct object_id *a, const struct object_id *b)
 
 enum rename_type {
 	RENAME_NORMAL = 0,
+	RENAME_DIR,
 	RENAME_DELETE,
 	RENAME_ONE_FILE_TO_ONE,
 	RENAME_ONE_FILE_TO_TWO,
@@ -228,7 +290,7 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
 		strbuf_addf(&o->obuf, "virtual %s\n",
 			merge_remote_util(commit)->name);
 	else {
-		strbuf_add_unique_abbrev(&o->obuf, commit->object.oid.hash,
+		strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
 					 DEFAULT_ABBREV);
 		strbuf_addch(&o->obuf, ' ');
 		if (parse_commit(commit) != 0)
@@ -275,32 +337,37 @@ static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
 	init_tree_desc(desc, tree->buffer, tree->size);
 }
 
-static int git_merge_trees(int index_only,
+static int git_merge_trees(struct merge_options *o,
 			   struct tree *common,
 			   struct tree *head,
 			   struct tree *merge)
 {
 	int rc;
 	struct tree_desc t[3];
-	struct unpack_trees_options opts;
 
-	memset(&opts, 0, sizeof(opts));
-	if (index_only)
-		opts.index_only = 1;
+	memset(&o->unpack_opts, 0, sizeof(o->unpack_opts));
+	if (o->call_depth)
+		o->unpack_opts.index_only = 1;
 	else
-		opts.update = 1;
-	opts.merge = 1;
-	opts.head_idx = 2;
-	opts.fn = threeway_merge;
-	opts.src_index = &the_index;
-	opts.dst_index = &the_index;
-	setup_unpack_trees_porcelain(&opts, "merge");
+		o->unpack_opts.update = 1;
+	o->unpack_opts.merge = 1;
+	o->unpack_opts.head_idx = 2;
+	o->unpack_opts.fn = threeway_merge;
+	o->unpack_opts.src_index = &the_index;
+	o->unpack_opts.dst_index = &the_index;
+	setup_unpack_trees_porcelain(&o->unpack_opts, "merge");
 
 	init_tree_desc_from_tree(t+0, common);
 	init_tree_desc_from_tree(t+1, head);
 	init_tree_desc_from_tree(t+2, merge);
 
-	rc = unpack_trees(3, t, &opts);
+	rc = unpack_trees(3, t, &o->unpack_opts);
+	/*
+	 * unpack_trees NULLifies src_index, but it's used in verify_uptodate,
+	 * so set to the new index which will usually have modification
+	 * timestamp info copied over.
+	 */
+	o->unpack_opts.src_index = &the_index;
 	cache_tree_free(&active_cache_tree);
 	return rc;
 }
@@ -335,7 +402,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 	return result;
 }
 
-static int save_files_dirs(const unsigned char *sha1,
+static int save_files_dirs(const struct object_id *oid,
 		struct strbuf *base, const char *path,
 		unsigned int mode, int stage, void *context)
 {
@@ -360,6 +427,21 @@ static void get_files_dirs(struct merge_options *o, struct tree *tree)
 	read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
 }
 
+static int get_tree_entry_if_blob(struct tree *tree,
+				  const char *path,
+				  struct object_id *hashy,
+				  unsigned int *mode_o)
+{
+	int ret;
+
+	ret = get_tree_entry(&tree->object.oid, path, hashy, mode_o);
+	if (S_ISDIR(*mode_o)) {
+		oidcpy(hashy, &null_oid);
+		*mode_o = 0;
+	}
+	return ret;
+}
+
 /*
  * Returns an index_entry instance which doesn't have to correspond to
  * a real cache entry in Git's index.
@@ -370,12 +452,12 @@ static struct stage_data *insert_stage_data(const char *path,
 {
 	struct string_list_item *item;
 	struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
-	get_tree_entry(o->object.oid.hash, path,
-			e->stages[1].oid.hash, &e->stages[1].mode);
-	get_tree_entry(a->object.oid.hash, path,
-			e->stages[2].oid.hash, &e->stages[2].mode);
-	get_tree_entry(b->object.oid.hash, path,
-			e->stages[3].oid.hash, &e->stages[3].mode);
+	get_tree_entry_if_blob(o, path,
+			       &e->stages[1].oid, &e->stages[1].mode);
+	get_tree_entry_if_blob(a, path,
+			       &e->stages[2].oid, &e->stages[2].mode);
+	get_tree_entry_if_blob(b, path,
+			       &e->stages[3].oid, &e->stages[3].mode);
 	item = string_list_insert(entries, path);
 	item->util = e;
 	return e;
@@ -513,80 +595,31 @@ static void record_df_conflict_files(struct merge_options *o,
 
 struct rename {
 	struct diff_filepair *pair;
+	/*
+	 * Purpose of src_entry and dst_entry:
+	 *
+	 * If 'before' is renamed to 'after' then src_entry will contain
+	 * the versions of 'before' from the merge_base, HEAD, and MERGE in
+	 * stages 1, 2, and 3; dst_entry will contain the respective
+	 * versions of 'after' in corresponding locations.  Thus, we have a
+	 * total of six modes and oids, though some will be null.  (Stage 0
+	 * is ignored; we're interested in handling conflicts.)
+	 *
+	 * Since we don't turn on break-rewrites by default, neither
+	 * src_entry nor dst_entry can have all three of their stages have
+	 * non-null oids, meaning at most four of the six will be non-null.
+	 * Also, since this is a rename, both src_entry and dst_entry will
+	 * have at least one non-null oid, meaning at least two will be
+	 * non-null.  Of the six oids, a typical rename will have three be
+	 * non-null.  Only two implies a rename/delete, and four implies a
+	 * rename/add.
+	 */
 	struct stage_data *src_entry;
 	struct stage_data *dst_entry;
+	unsigned add_turned_into_rename:1;
 	unsigned processed:1;
 };
 
-/*
- * Get information of all renames which occurred between 'o_tree' and
- * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
- * 'b_tree') to be able to associate the correct cache entries with
- * the rename information. 'tree' is always equal to either a_tree or b_tree.
- */
-static struct string_list *get_renames(struct merge_options *o,
-				       struct tree *tree,
-				       struct tree *o_tree,
-				       struct tree *a_tree,
-				       struct tree *b_tree,
-				       struct string_list *entries)
-{
-	int i;
-	struct string_list *renames;
-	struct diff_options opts;
-
-	renames = xcalloc(1, sizeof(struct string_list));
-	if (!o->detect_rename)
-		return renames;
-
-	diff_setup(&opts);
-	opts.flags.recursive = 1;
-	opts.flags.rename_empty = 0;
-	opts.detect_rename = DIFF_DETECT_RENAME;
-	opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
-			    o->diff_rename_limit >= 0 ? o->diff_rename_limit :
-			    1000;
-	opts.rename_score = o->rename_score;
-	opts.show_rename_progress = o->show_rename_progress;
-	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
-	diff_setup_done(&opts);
-	diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
-	diffcore_std(&opts);
-	if (opts.needed_rename_limit > o->needed_rename_limit)
-		o->needed_rename_limit = opts.needed_rename_limit;
-	for (i = 0; i < diff_queued_diff.nr; ++i) {
-		struct string_list_item *item;
-		struct rename *re;
-		struct diff_filepair *pair = diff_queued_diff.queue[i];
-		if (pair->status != 'R') {
-			diff_free_filepair(pair);
-			continue;
-		}
-		re = xmalloc(sizeof(*re));
-		re->processed = 0;
-		re->pair = pair;
-		item = string_list_lookup(entries, re->pair->one->path);
-		if (!item)
-			re->src_entry = insert_stage_data(re->pair->one->path,
-					o_tree, a_tree, b_tree, entries);
-		else
-			re->src_entry = item->util;
-
-		item = string_list_lookup(entries, re->pair->two->path);
-		if (!item)
-			re->dst_entry = insert_stage_data(re->pair->two->path,
-					o_tree, a_tree, b_tree, entries);
-		else
-			re->dst_entry = item->util;
-		item = string_list_insert(renames, pair->one->path);
-		item->util = re;
-	}
-	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
-	diff_queued_diff.nr = 0;
-	diff_flush(&opts);
-	return renames;
-}
-
 static int update_stages(struct merge_options *opt, const char *path,
 			 const struct diff_filespec *o,
 			 const struct diff_filespec *a,
@@ -618,6 +651,27 @@ static int update_stages(struct merge_options *opt, const char *path,
 	return 0;
 }
 
+static int update_stages_for_stage_data(struct merge_options *opt,
+					const char *path,
+					const struct stage_data *stage_data)
+{
+	struct diff_filespec o, a, b;
+
+	o.mode = stage_data->stages[1].mode;
+	oidcpy(&o.oid, &stage_data->stages[1].oid);
+
+	a.mode = stage_data->stages[2].mode;
+	oidcpy(&a.oid, &stage_data->stages[2].oid);
+
+	b.mode = stage_data->stages[3].mode;
+	oidcpy(&b.oid, &stage_data->stages[3].oid);
+
+	return update_stages(opt, path,
+			     is_null_oid(&o.oid) ? NULL : &o,
+			     is_null_oid(&a.oid) ? NULL : &a,
+			     is_null_oid(&b.oid) ? NULL : &b);
+}
+
 static void update_entry(struct stage_data *entry,
 			 struct diff_filespec *o,
 			 struct diff_filespec *a,
@@ -746,6 +800,20 @@ static int would_lose_untracked(const char *path)
 	return !was_tracked(path) && file_exists(path);
 }
 
+static int was_dirty(struct merge_options *o, const char *path)
+{
+	struct cache_entry *ce;
+	int dirty = 1;
+
+	if (o->call_depth || !was_tracked(path))
+		return !dirty;
+
+	ce = cache_file_exists(path, strlen(path), ignore_case);
+	dirty = (ce->ce_stat_data.sd_mtime.sec > 0 &&
+		 verify_uptodate(ce, &o->unpack_opts) != 0);
+	return dirty;
+}
+
 static int make_room_for_path(struct merge_options *o, const char *path)
 {
 	int status, i;
@@ -823,7 +891,7 @@ static int update_file_flags(struct merge_options *o,
 			goto update_index;
 		}
 
-		buf = read_sha1_file(oid->hash, &type, &size);
+		buf = read_object_file(oid, &type, &size);
 		if (!buf)
 			return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
 		if (type != OBJ_BLOB) {
@@ -1009,8 +1077,9 @@ static int merge_file_1(struct merge_options *o,
 			if ((merge_status < 0) || !result_buf.ptr)
 				ret = err(o, _("Failed to execute internal merge"));
 
-			if (!ret && write_sha1_file(result_buf.ptr, result_buf.size,
-						    blob_type, result->oid.hash))
+			if (!ret &&
+			    write_object_file(result_buf.ptr, result_buf.size,
+					      blob_type, &result->oid))
 				ret = err(o, _("Unable to add %s to database"),
 					  a->path);
 
@@ -1094,6 +1163,38 @@ static int merge_file_one(struct merge_options *o,
 	return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
 }
 
+static int conflict_rename_dir(struct merge_options *o,
+			       struct diff_filepair *pair,
+			       const char *rename_branch,
+			       const char *other_branch)
+{
+	const struct diff_filespec *dest = pair->two;
+
+	if (!o->call_depth && would_lose_untracked(dest->path)) {
+		char *alt_path = unique_path(o, dest->path, rename_branch);
+
+		output(o, 1, _("Error: Refusing to lose untracked file at %s; "
+			       "writing to %s instead."),
+		       dest->path, alt_path);
+		/*
+		 * Write the file in worktree at alt_path, but not in the
+		 * index.  Instead, write to dest->path for the index but
+		 * only at the higher appropriate stage.
+		 */
+		if (update_file(o, 0, &dest->oid, dest->mode, alt_path))
+			return -1;
+		free(alt_path);
+		return update_stages(o, dest->path, NULL,
+				     rename_branch == o->branch1 ? dest : NULL,
+				     rename_branch == o->branch1 ? NULL : dest);
+	}
+
+	/* Update dest->path both in index and in worktree */
+	if (update_file(o, 1, &dest->oid, dest->mode, dest->path))
+		return -1;
+	return 0;
+}
+
 static int handle_change_delete(struct merge_options *o,
 				 const char *path, const char *old_path,
 				 const struct object_id *o_oid, int o_mode,
@@ -1107,7 +1208,8 @@ static int handle_change_delete(struct merge_options *o,
 	const char *update_path = path;
 	int ret = 0;
 
-	if (dir_in_way(path, !o->call_depth, 0)) {
+	if (dir_in_way(path, !o->call_depth, 0) ||
+	    (!o->call_depth && would_lose_untracked(path))) {
 		update_path = alt_path = unique_path(o, path, change_branch);
 	}
 
@@ -1222,17 +1324,34 @@ static int handle_file(struct merge_options *o,
 
 	add = filespec_from_entry(&other, dst_entry, stage ^ 1);
 	if (add) {
+		int ren_src_was_dirty = was_dirty(o, rename->path);
 		char *add_name = unique_path(o, rename->path, other_branch);
 		if (update_file(o, 0, &add->oid, add->mode, add_name))
 			return -1;
 
-		remove_file(o, 0, rename->path, 0);
+		if (ren_src_was_dirty) {
+			output(o, 1, _("Refusing to lose dirty file at %s"),
+			       rename->path);
+		}
+		/*
+		 * Because the double negatives somehow keep confusing me...
+		 *    1) update_wd iff !ren_src_was_dirty.
+		 *    2) no_wd iff !update_wd
+		 *    3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
+		 */
+		remove_file(o, 0, rename->path, ren_src_was_dirty);
 		dst_name = unique_path(o, rename->path, cur_branch);
 	} else {
 		if (dir_in_way(rename->path, !o->call_depth, 0)) {
 			dst_name = unique_path(o, rename->path, cur_branch);
 			output(o, 1, _("%s is a directory in %s adding as %s instead"),
 			       rename->path, other_branch, dst_name);
+		} else if (!o->call_depth &&
+			   would_lose_untracked(rename->path)) {
+			dst_name = unique_path(o, rename->path, cur_branch);
+			output(o, 1, _("Refusing to lose untracked file at %s; "
+				       "adding as %s instead"),
+			       rename->path, dst_name);
 		}
 	}
 	if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
@@ -1358,11 +1477,43 @@ static int conflict_rename_rename_2to1(struct merge_options *o,
 		char *new_path2 = unique_path(o, path, ci->branch2);
 		output(o, 1, _("Renaming %s to %s and %s to %s instead"),
 		       a->path, new_path1, b->path, new_path2);
-		remove_file(o, 0, path, 0);
+		if (was_dirty(o, path))
+			output(o, 1, _("Refusing to lose dirty file at %s"),
+			       path);
+		else if (would_lose_untracked(path))
+			/*
+			 * Only way we get here is if both renames were from
+			 * a directory rename AND user had an untracked file
+			 * at the location where both files end up after the
+			 * two directory renames.  See testcase 10d of t6043.
+			 */
+			output(o, 1, _("Refusing to lose untracked file at "
+				       "%s, even though it's in the way."),
+			       path);
+		else
+			remove_file(o, 0, path, 0);
 		ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
 		if (!ret)
 			ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
 					  new_path2);
+		/*
+		 * unpack_trees() actually populates the index for us for
+		 * "normal" rename/rename(2to1) situtations so that the
+		 * correct entries are at the higher stages, which would
+		 * make the call below to update_stages_for_stage_data
+		 * unnecessary.  However, if either of the renames came
+		 * from a directory rename, then unpack_trees() will not
+		 * have gotten the right data loaded into the index, so we
+		 * need to do so now.  (While it'd be tempting to move this
+		 * call to update_stages_for_stage_data() to
+		 * apply_directory_rename_modifications(), that would break
+		 * our intermediate calls to would_lose_untracked() since
+		 * those rely on the current in-memory index.  See also the
+		 * big "NOTE" in update_stages()).
+		 */
+		if (update_stages_for_stage_data(o, path, ci->dst_entry1))
+			ret = -1;
+
 		free(new_path2);
 		free(new_path1);
 	}
@@ -1370,6 +1521,754 @@ static int conflict_rename_rename_2to1(struct merge_options *o,
 	return ret;
 }
 
+/*
+ * Get the diff_filepairs changed between o_tree and tree.
+ */
+static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
+					       struct tree *o_tree,
+					       struct tree *tree)
+{
+	struct diff_queue_struct *ret;
+	struct diff_options opts;
+
+	diff_setup(&opts);
+	opts.flags.recursive = 1;
+	opts.flags.rename_empty = 0;
+	opts.detect_rename = DIFF_DETECT_RENAME;
+	opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
+			    o->diff_rename_limit >= 0 ? o->diff_rename_limit :
+			    1000;
+	opts.rename_score = o->rename_score;
+	opts.show_rename_progress = o->show_rename_progress;
+	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+	diff_setup_done(&opts);
+	diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
+	diffcore_std(&opts);
+	if (opts.needed_rename_limit > o->needed_rename_limit)
+		o->needed_rename_limit = opts.needed_rename_limit;
+
+	ret = xmalloc(sizeof(*ret));
+	*ret = diff_queued_diff;
+
+	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+	diff_queued_diff.nr = 0;
+	diff_queued_diff.queue = NULL;
+	diff_flush(&opts);
+	return ret;
+}
+
+static int tree_has_path(struct tree *tree, const char *path)
+{
+	struct object_id hashy;
+	unsigned int mode_o;
+
+	return !get_tree_entry(&tree->object.oid, path,
+			       &hashy, &mode_o);
+}
+
+/*
+ * Return a new string that replaces the beginning portion (which matches
+ * entry->dir), with entry->new_dir.  In perl-speak:
+ *   new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
+ * NOTE:
+ *   Caller must ensure that old_path starts with entry->dir + '/'.
+ */
+static char *apply_dir_rename(struct dir_rename_entry *entry,
+			      const char *old_path)
+{
+	struct strbuf new_path = STRBUF_INIT;
+	int oldlen, newlen;
+
+	if (entry->non_unique_new_dir)
+		return NULL;
+
+	oldlen = strlen(entry->dir);
+	newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
+	strbuf_grow(&new_path, newlen);
+	strbuf_addbuf(&new_path, &entry->new_dir);
+	strbuf_addstr(&new_path, &old_path[oldlen]);
+
+	return strbuf_detach(&new_path, NULL);
+}
+
+static void get_renamed_dir_portion(const char *old_path, const char *new_path,
+				    char **old_dir, char **new_dir)
+{
+	char *end_of_old, *end_of_new;
+	int old_len, new_len;
+
+	*old_dir = NULL;
+	*new_dir = NULL;
+
+	/*
+	 * For
+	 *    "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
+	 * the "e/foo.c" part is the same, we just want to know that
+	 *    "a/b/c/d" was renamed to "a/b/some/thing/else"
+	 * so, for this example, this function returns "a/b/c/d" in
+	 * *old_dir and "a/b/some/thing/else" in *new_dir.
+	 *
+	 * Also, if the basename of the file changed, we don't care.  We
+	 * want to know which portion of the directory, if any, changed.
+	 */
+	end_of_old = strrchr(old_path, '/');
+	end_of_new = strrchr(new_path, '/');
+
+	if (end_of_old == NULL || end_of_new == NULL)
+		return;
+	while (*--end_of_new == *--end_of_old &&
+	       end_of_old != old_path &&
+	       end_of_new != new_path)
+		; /* Do nothing; all in the while loop */
+	/*
+	 * We've found the first non-matching character in the directory
+	 * paths.  That means the current directory we were comparing
+	 * represents the rename.  Move end_of_old and end_of_new back
+	 * to the full directory name.
+	 */
+	if (*end_of_old == '/')
+		end_of_old++;
+	if (*end_of_old != '/')
+		end_of_new++;
+	end_of_old = strchr(end_of_old, '/');
+	end_of_new = strchr(end_of_new, '/');
+
+	/*
+	 * It may have been the case that old_path and new_path were the same
+	 * directory all along.  Don't claim a rename if they're the same.
+	 */
+	old_len = end_of_old - old_path;
+	new_len = end_of_new - new_path;
+
+	if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
+		*old_dir = xstrndup(old_path, old_len);
+		*new_dir = xstrndup(new_path, new_len);
+	}
+}
+
+static void remove_hashmap_entries(struct hashmap *dir_renames,
+				   struct string_list *items_to_remove)
+{
+	int i;
+	struct dir_rename_entry *entry;
+
+	for (i = 0; i < items_to_remove->nr; i++) {
+		entry = items_to_remove->items[i].util;
+		hashmap_remove(dir_renames, entry, NULL);
+	}
+	string_list_clear(items_to_remove, 0);
+}
+
+/*
+ * See if there is a directory rename for path, and if there are any file
+ * level conflicts for the renamed location.  If there is a rename and
+ * there are no conflicts, return the new name.  Otherwise, return NULL.
+ */
+static char *handle_path_level_conflicts(struct merge_options *o,
+					 const char *path,
+					 struct dir_rename_entry *entry,
+					 struct hashmap *collisions,
+					 struct tree *tree)
+{
+	char *new_path = NULL;
+	struct collision_entry *collision_ent;
+	int clean = 1;
+	struct strbuf collision_paths = STRBUF_INIT;
+
+	/*
+	 * entry has the mapping of old directory name to new directory name
+	 * that we want to apply to path.
+	 */
+	new_path = apply_dir_rename(entry, path);
+
+	if (!new_path) {
+		/* This should only happen when entry->non_unique_new_dir set */
+		if (!entry->non_unique_new_dir)
+			BUG("entry->non_unqiue_dir not set and !new_path");
+		output(o, 1, _("CONFLICT (directory rename split): "
+			       "Unclear where to place %s because directory "
+			       "%s was renamed to multiple other directories, "
+			       "with no destination getting a majority of the "
+			       "files."),
+		       path, entry->dir);
+		clean = 0;
+		return NULL;
+	}
+
+	/*
+	 * The caller needs to have ensured that it has pre-populated
+	 * collisions with all paths that map to new_path.  Do a quick check
+	 * to ensure that's the case.
+	 */
+	collision_ent = collision_find_entry(collisions, new_path);
+	if (collision_ent == NULL)
+		BUG("collision_ent is NULL");
+
+	/*
+	 * Check for one-sided add/add/.../add conflicts, i.e.
+	 * where implicit renames from the other side doing
+	 * directory rename(s) can affect this side of history
+	 * to put multiple paths into the same location.  Warn
+	 * and bail on directory renames for such paths.
+	 */
+	if (collision_ent->reported_already) {
+		clean = 0;
+	} else if (tree_has_path(tree, new_path)) {
+		collision_ent->reported_already = 1;
+		strbuf_add_separated_string_list(&collision_paths, ", ",
+						 &collision_ent->source_files);
+		output(o, 1, _("CONFLICT (implicit dir rename): Existing "
+			       "file/dir at %s in the way of implicit "
+			       "directory rename(s) putting the following "
+			       "path(s) there: %s."),
+		       new_path, collision_paths.buf);
+		clean = 0;
+	} else if (collision_ent->source_files.nr > 1) {
+		collision_ent->reported_already = 1;
+		strbuf_add_separated_string_list(&collision_paths, ", ",
+						 &collision_ent->source_files);
+		output(o, 1, _("CONFLICT (implicit dir rename): Cannot map "
+			       "more than one path to %s; implicit directory "
+			       "renames tried to put these paths there: %s"),
+		       new_path, collision_paths.buf);
+		clean = 0;
+	}
+
+	/* Free memory we no longer need */
+	strbuf_release(&collision_paths);
+	if (!clean && new_path) {
+		free(new_path);
+		return NULL;
+	}
+
+	return new_path;
+}
+
+/*
+ * There are a couple things we want to do at the directory level:
+ *   1. Check for both sides renaming to the same thing, in order to avoid
+ *      implicit renaming of files that should be left in place.  (See
+ *      testcase 6b in t6043 for details.)
+ *   2. Prune directory renames if there are still files left in the
+ *      the original directory.  These represent a partial directory rename,
+ *      i.e. a rename where only some of the files within the directory
+ *      were renamed elsewhere.  (Technically, this could be done earlier
+ *      in get_directory_renames(), except that would prevent us from
+ *      doing the previous check and thus failing testcase 6b.)
+ *   3. Check for rename/rename(1to2) conflicts (at the directory level).
+ *      In the future, we could potentially record this info as well and
+ *      omit reporting rename/rename(1to2) conflicts for each path within
+ *      the affected directories, thus cleaning up the merge output.
+ *   NOTE: We do NOT check for rename/rename(2to1) conflicts at the
+ *         directory level, because merging directories is fine.  If it
+ *         causes conflicts for files within those merged directories, then
+ *         that should be detected at the individual path level.
+ */
+static void handle_directory_level_conflicts(struct merge_options *o,
+					     struct hashmap *dir_re_head,
+					     struct tree *head,
+					     struct hashmap *dir_re_merge,
+					     struct tree *merge)
+{
+	struct hashmap_iter iter;
+	struct dir_rename_entry *head_ent;
+	struct dir_rename_entry *merge_ent;
+
+	struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
+	struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
+
+	hashmap_iter_init(dir_re_head, &iter);
+	while ((head_ent = hashmap_iter_next(&iter))) {
+		merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
+		if (merge_ent &&
+		    !head_ent->non_unique_new_dir &&
+		    !merge_ent->non_unique_new_dir &&
+		    !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
+			/* 1. Renamed identically; remove it from both sides */
+			string_list_append(&remove_from_head,
+					   head_ent->dir)->util = head_ent;
+			strbuf_release(&head_ent->new_dir);
+			string_list_append(&remove_from_merge,
+					   merge_ent->dir)->util = merge_ent;
+			strbuf_release(&merge_ent->new_dir);
+		} else if (tree_has_path(head, head_ent->dir)) {
+			/* 2. This wasn't a directory rename after all */
+			string_list_append(&remove_from_head,
+					   head_ent->dir)->util = head_ent;
+			strbuf_release(&head_ent->new_dir);
+		}
+	}
+
+	remove_hashmap_entries(dir_re_head, &remove_from_head);
+	remove_hashmap_entries(dir_re_merge, &remove_from_merge);
+
+	hashmap_iter_init(dir_re_merge, &iter);
+	while ((merge_ent = hashmap_iter_next(&iter))) {
+		head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
+		if (tree_has_path(merge, merge_ent->dir)) {
+			/* 2. This wasn't a directory rename after all */
+			string_list_append(&remove_from_merge,
+					   merge_ent->dir)->util = merge_ent;
+		} else if (head_ent &&
+			   !head_ent->non_unique_new_dir &&
+			   !merge_ent->non_unique_new_dir) {
+			/* 3. rename/rename(1to2) */
+			/*
+			 * We can assume it's not rename/rename(1to1) because
+			 * that was case (1), already checked above.  So we
+			 * know that head_ent->new_dir and merge_ent->new_dir
+			 * are different strings.
+			 */
+			output(o, 1, _("CONFLICT (rename/rename): "
+				       "Rename directory %s->%s in %s. "
+				       "Rename directory %s->%s in %s"),
+			       head_ent->dir, head_ent->new_dir.buf, o->branch1,
+			       head_ent->dir, merge_ent->new_dir.buf, o->branch2);
+			string_list_append(&remove_from_head,
+					   head_ent->dir)->util = head_ent;
+			strbuf_release(&head_ent->new_dir);
+			string_list_append(&remove_from_merge,
+					   merge_ent->dir)->util = merge_ent;
+			strbuf_release(&merge_ent->new_dir);
+		}
+	}
+
+	remove_hashmap_entries(dir_re_head, &remove_from_head);
+	remove_hashmap_entries(dir_re_merge, &remove_from_merge);
+}
+
+static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
+					     struct tree *tree)
+{
+	struct hashmap *dir_renames;
+	struct hashmap_iter iter;
+	struct dir_rename_entry *entry;
+	int i;
+
+	/*
+	 * Typically, we think of a directory rename as all files from a
+	 * certain directory being moved to a target directory.  However,
+	 * what if someone first moved two files from the original
+	 * directory in one commit, and then renamed the directory
+	 * somewhere else in a later commit?  At merge time, we just know
+	 * that files from the original directory went to two different
+	 * places, and that the bulk of them ended up in the same place.
+	 * We want each directory rename to represent where the bulk of the
+	 * files from that directory end up; this function exists to find
+	 * where the bulk of the files went.
+	 *
+	 * The first loop below simply iterates through the list of file
+	 * renames, finding out how often each directory rename pair
+	 * possibility occurs.
+	 */
+	dir_renames = xmalloc(sizeof(struct hashmap));
+	dir_rename_init(dir_renames);
+	for (i = 0; i < pairs->nr; ++i) {
+		struct string_list_item *item;
+		int *count;
+		struct diff_filepair *pair = pairs->queue[i];
+		char *old_dir, *new_dir;
+
+		/* File not part of directory rename if it wasn't renamed */
+		if (pair->status != 'R')
+			continue;
+
+		get_renamed_dir_portion(pair->one->path, pair->two->path,
+					&old_dir,        &new_dir);
+		if (!old_dir)
+			/* Directory didn't change at all; ignore this one. */
+			continue;
+
+		entry = dir_rename_find_entry(dir_renames, old_dir);
+		if (!entry) {
+			entry = xmalloc(sizeof(struct dir_rename_entry));
+			dir_rename_entry_init(entry, old_dir);
+			hashmap_put(dir_renames, entry);
+		} else {
+			free(old_dir);
+		}
+		item = string_list_lookup(&entry->possible_new_dirs, new_dir);
+		if (!item) {
+			item = string_list_insert(&entry->possible_new_dirs,
+						  new_dir);
+			item->util = xcalloc(1, sizeof(int));
+		} else {
+			free(new_dir);
+		}
+		count = item->util;
+		*count += 1;
+	}
+
+	/*
+	 * For each directory with files moved out of it, we find out which
+	 * target directory received the most files so we can declare it to
+	 * be the "winning" target location for the directory rename.  This
+	 * winner gets recorded in new_dir.  If there is no winner
+	 * (multiple target directories received the same number of files),
+	 * we set non_unique_new_dir.  Once we've determined the winner (or
+	 * that there is no winner), we no longer need possible_new_dirs.
+	 */
+	hashmap_iter_init(dir_renames, &iter);
+	while ((entry = hashmap_iter_next(&iter))) {
+		int max = 0;
+		int bad_max = 0;
+		char *best = NULL;
+
+		for (i = 0; i < entry->possible_new_dirs.nr; i++) {
+			int *count = entry->possible_new_dirs.items[i].util;
+
+			if (*count == max)
+				bad_max = max;
+			else if (*count > max) {
+				max = *count;
+				best = entry->possible_new_dirs.items[i].string;
+			}
+		}
+		if (bad_max == max)
+			entry->non_unique_new_dir = 1;
+		else {
+			assert(entry->new_dir.len == 0);
+			strbuf_addstr(&entry->new_dir, best);
+		}
+		/*
+		 * The relevant directory sub-portion of the original full
+		 * filepaths were xstrndup'ed before inserting into
+		 * possible_new_dirs, and instead of manually iterating the
+		 * list and free'ing each, just lie and tell
+		 * possible_new_dirs that it did the strdup'ing so that it
+		 * will free them for us.
+		 */
+		entry->possible_new_dirs.strdup_strings = 1;
+		string_list_clear(&entry->possible_new_dirs, 1);
+	}
+
+	return dir_renames;
+}
+
+static struct dir_rename_entry *check_dir_renamed(const char *path,
+						  struct hashmap *dir_renames)
+{
+	char temp[PATH_MAX];
+	char *end;
+	struct dir_rename_entry *entry;
+
+	strcpy(temp, path);
+	while ((end = strrchr(temp, '/'))) {
+		*end = '\0';
+		entry = dir_rename_find_entry(dir_renames, temp);
+		if (entry)
+			return entry;
+	}
+	return NULL;
+}
+
+static void compute_collisions(struct hashmap *collisions,
+			       struct hashmap *dir_renames,
+			       struct diff_queue_struct *pairs)
+{
+	int i;
+
+	/*
+	 * Multiple files can be mapped to the same path due to directory
+	 * renames done by the other side of history.  Since that other
+	 * side of history could have merged multiple directories into one,
+	 * if our side of history added the same file basename to each of
+	 * those directories, then all N of them would get implicitly
+	 * renamed by the directory rename detection into the same path,
+	 * and we'd get an add/add/.../add conflict, and all those adds
+	 * from *this* side of history.  This is not representable in the
+	 * index, and users aren't going to easily be able to make sense of
+	 * it.  So we need to provide a good warning about what's
+	 * happening, and fall back to no-directory-rename detection
+	 * behavior for those paths.
+	 *
+	 * See testcases 9e and all of section 5 from t6043 for examples.
+	 */
+	collision_init(collisions);
+
+	for (i = 0; i < pairs->nr; ++i) {
+		struct dir_rename_entry *dir_rename_ent;
+		struct collision_entry *collision_ent;
+		char *new_path;
+		struct diff_filepair *pair = pairs->queue[i];
+
+		if (pair->status != 'A' && pair->status != 'R')
+			continue;
+		dir_rename_ent = check_dir_renamed(pair->two->path,
+						   dir_renames);
+		if (!dir_rename_ent)
+			continue;
+
+		new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
+		if (!new_path)
+			/*
+			 * dir_rename_ent->non_unique_new_path is true, which
+			 * means there is no directory rename for us to use,
+			 * which means it won't cause us any additional
+			 * collisions.
+			 */
+			continue;
+		collision_ent = collision_find_entry(collisions, new_path);
+		if (!collision_ent) {
+			collision_ent = xcalloc(1,
+						sizeof(struct collision_entry));
+			hashmap_entry_init(collision_ent, strhash(new_path));
+			hashmap_put(collisions, collision_ent);
+			collision_ent->target_file = new_path;
+		} else {
+			free(new_path);
+		}
+		string_list_insert(&collision_ent->source_files,
+				   pair->two->path);
+	}
+}
+
+static char *check_for_directory_rename(struct merge_options *o,
+					const char *path,
+					struct tree *tree,
+					struct hashmap *dir_renames,
+					struct hashmap *dir_rename_exclusions,
+					struct hashmap *collisions,
+					int *clean_merge)
+{
+	char *new_path = NULL;
+	struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames);
+	struct dir_rename_entry *oentry = NULL;
+
+	if (!entry)
+		return new_path;
+
+	/*
+	 * This next part is a little weird.  We do not want to do an
+	 * implicit rename into a directory we renamed on our side, because
+	 * that will result in a spurious rename/rename(1to2) conflict.  An
+	 * example:
+	 *   Base commit: dumbdir/afile, otherdir/bfile
+	 *   Side 1:      smrtdir/afile, otherdir/bfile
+	 *   Side 2:      dumbdir/afile, dumbdir/bfile
+	 * Here, while working on Side 1, we could notice that otherdir was
+	 * renamed/merged to dumbdir, and change the diff_filepair for
+	 * otherdir/bfile into a rename into dumbdir/bfile.  However, Side
+	 * 2 will notice the rename from dumbdir to smrtdir, and do the
+	 * transitive rename to move it from dumbdir/bfile to
+	 * smrtdir/bfile.  That gives us bfile in dumbdir vs being in
+	 * smrtdir, a rename/rename(1to2) conflict.  We really just want
+	 * the file to end up in smrtdir.  And the way to achieve that is
+	 * to not let Side1 do the rename to dumbdir, since we know that is
+	 * the source of one of our directory renames.
+	 *
+	 * That's why oentry and dir_rename_exclusions is here.
+	 *
+	 * As it turns out, this also prevents N-way transient rename
+	 * confusion; See testcases 9c and 9d of t6043.
+	 */
+	oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
+	if (oentry) {
+		output(o, 1, _("WARNING: Avoiding applying %s -> %s rename "
+			       "to %s, because %s itself was renamed."),
+		       entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
+	} else {
+		new_path = handle_path_level_conflicts(o, path, entry,
+						       collisions, tree);
+		*clean_merge &= (new_path != NULL);
+	}
+
+	return new_path;
+}
+
+static void apply_directory_rename_modifications(struct merge_options *o,
+						 struct diff_filepair *pair,
+						 char *new_path,
+						 struct rename *re,
+						 struct tree *tree,
+						 struct tree *o_tree,
+						 struct tree *a_tree,
+						 struct tree *b_tree,
+						 struct string_list *entries,
+						 int *clean)
+{
+	struct string_list_item *item;
+	int stage = (tree == a_tree ? 2 : 3);
+	int update_wd;
+
+	/*
+	 * In all cases where we can do directory rename detection,
+	 * unpack_trees() will have read pair->two->path into the
+	 * index and the working copy.  We need to remove it so that
+	 * we can instead place it at new_path.  It is guaranteed to
+	 * not be untracked (unpack_trees() would have errored out
+	 * saying the file would have been overwritten), but it might
+	 * be dirty, though.
+	 */
+	update_wd = !was_dirty(o, pair->two->path);
+	if (!update_wd)
+		output(o, 1, _("Refusing to lose dirty file at %s"),
+		       pair->two->path);
+	remove_file(o, 1, pair->two->path, !update_wd);
+
+	/* Find or create a new re->dst_entry */
+	item = string_list_lookup(entries, new_path);
+	if (item) {
+		/*
+		 * Since we're renaming on this side of history, and it's
+		 * due to a directory rename on the other side of history
+		 * (which we only allow when the directory in question no
+		 * longer exists on the other side of history), the
+		 * original entry for re->dst_entry is no longer
+		 * necessary...
+		 */
+		re->dst_entry->processed = 1;
+
+		/*
+		 * ...because we'll be using this new one.
+		 */
+		re->dst_entry = item->util;
+	} else {
+		/*
+		 * re->dst_entry is for the before-dir-rename path, and we
+		 * need it to hold information for the after-dir-rename
+		 * path.  Before creating a new entry, we need to mark the
+		 * old one as unnecessary (...unless it is shared by
+		 * src_entry, i.e. this didn't use to be a rename, in which
+		 * case we can just allow the normal processing to happen
+		 * for it).
+		 */
+		if (pair->status == 'R')
+			re->dst_entry->processed = 1;
+
+		re->dst_entry = insert_stage_data(new_path,
+						  o_tree, a_tree, b_tree,
+						  entries);
+		item = string_list_insert(entries, new_path);
+		item->util = re->dst_entry;
+	}
+
+	/*
+	 * Update the stage_data with the information about the path we are
+	 * moving into place.  That slot will be empty and available for us
+	 * to write to because of the collision checks in
+	 * handle_path_level_conflicts().  In other words,
+	 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
+	 * open for us to write to.
+	 *
+	 * It may be tempting to actually update the index at this point as
+	 * well, using update_stages_for_stage_data(), but as per the big
+	 * "NOTE" in update_stages(), doing so will modify the current
+	 * in-memory index which will break calls to would_lose_untracked()
+	 * that we need to make.  Instead, we need to just make sure that
+	 * the various conflict_rename_*() functions update the index
+	 * explicitly rather than relying on unpack_trees() to have done it.
+	 */
+	get_tree_entry(&tree->object.oid,
+		       pair->two->path,
+		       &re->dst_entry->stages[stage].oid,
+		       &re->dst_entry->stages[stage].mode);
+
+	/* Update pair status */
+	if (pair->status == 'A') {
+		/*
+		 * Recording rename information for this add makes it look
+		 * like a rename/delete conflict.  Make sure we can
+		 * correctly handle this as an add that was moved to a new
+		 * directory instead of reporting a rename/delete conflict.
+		 */
+		re->add_turned_into_rename = 1;
+	}
+	/*
+	 * We don't actually look at pair->status again, but it seems
+	 * pedagogically correct to adjust it.
+	 */
+	pair->status = 'R';
+
+	/*
+	 * Finally, record the new location.
+	 */
+	pair->two->path = new_path;
+}
+
+/*
+ * Get information of all renames which occurred in 'pairs', making use of
+ * any implicit directory renames inferred from the other side of history.
+ * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
+ * to be able to associate the correct cache entries with the rename
+ * information; tree is always equal to either a_tree or b_tree.
+ */
+static struct string_list *get_renames(struct merge_options *o,
+				       struct diff_queue_struct *pairs,
+				       struct hashmap *dir_renames,
+				       struct hashmap *dir_rename_exclusions,
+				       struct tree *tree,
+				       struct tree *o_tree,
+				       struct tree *a_tree,
+				       struct tree *b_tree,
+				       struct string_list *entries,
+				       int *clean_merge)
+{
+	int i;
+	struct hashmap collisions;
+	struct hashmap_iter iter;
+	struct collision_entry *e;
+	struct string_list *renames;
+
+	compute_collisions(&collisions, dir_renames, pairs);
+	renames = xcalloc(1, sizeof(struct string_list));
+
+	for (i = 0; i < pairs->nr; ++i) {
+		struct string_list_item *item;
+		struct rename *re;
+		struct diff_filepair *pair = pairs->queue[i];
+		char *new_path; /* non-NULL only with directory renames */
+
+		if (pair->status != 'A' && pair->status != 'R') {
+			diff_free_filepair(pair);
+			continue;
+		}
+		new_path = check_for_directory_rename(o, pair->two->path, tree,
+						      dir_renames,
+						      dir_rename_exclusions,
+						      &collisions,
+						      clean_merge);
+		if (pair->status != 'R' && !new_path) {
+			diff_free_filepair(pair);
+			continue;
+		}
+
+		re = xmalloc(sizeof(*re));
+		re->processed = 0;
+		re->add_turned_into_rename = 0;
+		re->pair = pair;
+		item = string_list_lookup(entries, re->pair->one->path);
+		if (!item)
+			re->src_entry = insert_stage_data(re->pair->one->path,
+					o_tree, a_tree, b_tree, entries);
+		else
+			re->src_entry = item->util;
+
+		item = string_list_lookup(entries, re->pair->two->path);
+		if (!item)
+			re->dst_entry = insert_stage_data(re->pair->two->path,
+					o_tree, a_tree, b_tree, entries);
+		else
+			re->dst_entry = item->util;
+		item = string_list_insert(renames, pair->one->path);
+		item->util = re;
+		if (new_path)
+			apply_directory_rename_modifications(o, pair, new_path,
+							     re, tree, o_tree,
+							     a_tree, b_tree,
+							     entries,
+							     clean_merge);
+	}
+
+	hashmap_iter_init(&collisions, &iter);
+	while ((e = hashmap_iter_next(&iter))) {
+		free(e->target_file);
+		string_list_clear(&e->source_files, 0);
+	}
+	hashmap_free(&collisions, 1);
+	return renames;
+}
+
 static int process_renames(struct merge_options *o,
 			   struct string_list *a_renames,
 			   struct string_list *b_renames)
@@ -1528,7 +2427,19 @@ static int process_renames(struct merge_options *o,
 			dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
 			try_merge = 0;
 
-			if (oid_eq(&src_other.oid, &null_oid)) {
+			if (oid_eq(&src_other.oid, &null_oid) &&
+			    ren1->add_turned_into_rename) {
+				setup_rename_conflict_info(RENAME_DIR,
+							   ren1->pair,
+							   NULL,
+							   branch1,
+							   branch2,
+							   ren1->dst_entry,
+							   NULL,
+							   o,
+							   NULL,
+							   NULL);
+			} else if (oid_eq(&src_other.oid, &null_oid)) {
 				setup_rename_conflict_info(RENAME_DELETE,
 							   ren1->pair,
 							   NULL,
@@ -1625,6 +2536,105 @@ cleanup_and_return:
 	return clean_merge;
 }
 
+struct rename_info {
+	struct string_list *head_renames;
+	struct string_list *merge_renames;
+};
+
+static void initial_cleanup_rename(struct diff_queue_struct *pairs,
+				   struct hashmap *dir_renames)
+{
+	struct hashmap_iter iter;
+	struct dir_rename_entry *e;
+
+	hashmap_iter_init(dir_renames, &iter);
+	while ((e = hashmap_iter_next(&iter))) {
+		free(e->dir);
+		strbuf_release(&e->new_dir);
+		/* possible_new_dirs already cleared in get_directory_renames */
+	}
+	hashmap_free(dir_renames, 1);
+	free(dir_renames);
+
+	free(pairs->queue);
+	free(pairs);
+}
+
+static int handle_renames(struct merge_options *o,
+			  struct tree *common,
+			  struct tree *head,
+			  struct tree *merge,
+			  struct string_list *entries,
+			  struct rename_info *ri)
+{
+	struct diff_queue_struct *head_pairs, *merge_pairs;
+	struct hashmap *dir_re_head, *dir_re_merge;
+	int clean = 1;
+
+	ri->head_renames = NULL;
+	ri->merge_renames = NULL;
+
+	if (!o->detect_rename)
+		return 1;
+
+	head_pairs = get_diffpairs(o, common, head);
+	merge_pairs = get_diffpairs(o, common, merge);
+
+	dir_re_head = get_directory_renames(head_pairs, head);
+	dir_re_merge = get_directory_renames(merge_pairs, merge);
+
+	handle_directory_level_conflicts(o,
+					 dir_re_head, head,
+					 dir_re_merge, merge);
+
+	ri->head_renames  = get_renames(o, head_pairs,
+					dir_re_merge, dir_re_head, head,
+					common, head, merge, entries,
+					&clean);
+	if (clean < 0)
+		goto cleanup;
+	ri->merge_renames = get_renames(o, merge_pairs,
+					dir_re_head, dir_re_merge, merge,
+					common, head, merge, entries,
+					&clean);
+	if (clean < 0)
+		goto cleanup;
+	clean &= process_renames(o, ri->head_renames, ri->merge_renames);
+
+cleanup:
+	/*
+	 * Some cleanup is deferred until cleanup_renames() because the
+	 * data structures are still needed and referenced in
+	 * process_entry().  But there are a few things we can free now.
+	 */
+	initial_cleanup_rename(head_pairs, dir_re_head);
+	initial_cleanup_rename(merge_pairs, dir_re_merge);
+
+	return clean;
+}
+
+static void final_cleanup_rename(struct string_list *rename)
+{
+	const struct rename *re;
+	int i;
+
+	if (rename == NULL)
+		return;
+
+	for (i = 0; i < rename->nr; i++) {
+		re = rename->items[i].util;
+		diff_free_filepair(re->pair);
+	}
+	string_list_clear(rename, 1);
+	free(rename);
+}
+
+static void final_cleanup_renames(struct rename_info *re_info)
+{
+	final_cleanup_rename(re_info->head_renames);
+	final_cleanup_rename(re_info->merge_renames);
+}
+
 static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
 {
 	return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
@@ -1636,7 +2646,7 @@ static int read_oid_strbuf(struct merge_options *o,
 	void *buf;
 	enum object_type type;
 	unsigned long size;
-	buf = read_sha1_file(oid->hash, &type, &size);
+	buf = read_object_file(oid, &type, &size);
 	if (!buf)
 		return err(o, _("cannot read object %s"), oid_to_hex(oid));
 	if (type != OBJ_BLOB) {
@@ -1715,6 +2725,7 @@ static int handle_modify_delete(struct merge_options *o,
 
 static int merge_content(struct merge_options *o,
 			 const char *path,
+			 int file_in_way,
 			 struct object_id *o_oid, int o_mode,
 			 struct object_id *a_oid, int a_mode,
 			 struct object_id *b_oid, int b_mode,
@@ -1762,7 +2773,6 @@ static int merge_content(struct merge_options *o,
 
 	if (mfi.clean && !df_conflict_remains &&
 	    oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
-		int path_renamed_outside_HEAD;
 		output(o, 3, _("Skipped %s (merged same as existing)"), path);
 		/*
 		 * The content merge resulted in the same file contents we
@@ -1770,8 +2780,7 @@ static int merge_content(struct merge_options *o,
 		 * are recorded at the correct path (which may not be true
 		 * if the merge involves a rename).
 		 */
-		path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
-		if (!path_renamed_outside_HEAD) {
+		if (was_tracked(path)) {
 			add_cacheinfo(o, mfi.mode, &mfi.oid, path,
 				      0, (!o->call_depth), 0);
 			return mfi.clean;
@@ -1789,7 +2798,7 @@ static int merge_content(struct merge_options *o,
 				return -1;
 	}
 
-	if (df_conflict_remains) {
+	if (df_conflict_remains || file_in_way) {
 		char *new_path;
 		if (o->call_depth) {
 			remove_file_from_cache(path);
@@ -1823,6 +2832,30 @@ static int merge_content(struct merge_options *o,
 	return mfi.clean;
 }
 
+static int conflict_rename_normal(struct merge_options *o,
+				  const char *path,
+				  struct object_id *o_oid, unsigned int o_mode,
+				  struct object_id *a_oid, unsigned int a_mode,
+				  struct object_id *b_oid, unsigned int b_mode,
+				  struct rename_conflict_info *ci)
+{
+	int clean_merge;
+	int file_in_the_way = 0;
+
+	if (was_dirty(o, path)) {
+		file_in_the_way = 1;
+		output(o, 1, _("Refusing to lose dirty file at %s"), path);
+	}
+
+	/* Merge the content and write it out */
+	clean_merge = merge_content(o, path, file_in_the_way,
+				    o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
+				    ci);
+	if (clean_merge > 0 && file_in_the_way)
+		clean_merge = 0;
+	return clean_merge;
+}
+
 /* Per entry merge function */
 static int process_entry(struct merge_options *o,
 			 const char *path, struct stage_data *entry)
@@ -1842,9 +2875,20 @@ static int process_entry(struct merge_options *o,
 		switch (conflict_info->rename_type) {
 		case RENAME_NORMAL:
 		case RENAME_ONE_FILE_TO_ONE:
-			clean_merge = merge_content(o, path,
-						    o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
-						    conflict_info);
+			clean_merge = conflict_rename_normal(o,
+							     path,
+							     o_oid, o_mode,
+							     a_oid, a_mode,
+							     b_oid, b_mode,
+							     conflict_info);
+			break;
+		case RENAME_DIR:
+			clean_merge = 1;
+			if (conflict_rename_dir(o,
+						conflict_info->pair1,
+						conflict_info->branch1,
+						conflict_info->branch2))
+				clean_merge = -1;
 			break;
 		case RENAME_DELETE:
 			clean_merge = 0;
@@ -1932,7 +2976,7 @@ static int process_entry(struct merge_options *o,
 	} else if (a_oid && b_oid) {
 		/* Case C: Added in both (check for same permissions) and */
 		/* case D: Modified in both, but differently. */
-		clean_merge = merge_content(o, path,
+		clean_merge = merge_content(o, path, 0 /* file_in_way */,
 					    o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
 					    NULL);
 	} else if (!o_oid && !a_oid && !b_oid) {
@@ -1973,7 +3017,7 @@ int merge_trees(struct merge_options *o,
 		return 1;
 	}
 
-	code = git_merge_trees(o->call_depth, common, head, merge);
+	code = git_merge_trees(o, common, head, merge);
 
 	if (code != 0) {
 		if (show(o, 4) || o->call_depth)
@@ -1984,7 +3028,8 @@ int merge_trees(struct merge_options *o,
 	}
 
 	if (unmerged_cache()) {
-		struct string_list *entries, *re_head, *re_merge;
+		struct string_list *entries;
+		struct rename_info re_info;
 		int i;
 		/*
 		 * Only need the hashmap while processing entries, so
@@ -1998,10 +3043,9 @@ int merge_trees(struct merge_options *o,
 		get_files_dirs(o, merge);
 
 		entries = get_unmerged();
+		clean = handle_renames(o, common, head, merge, entries,
+				       &re_info);
 		record_df_conflict_files(o, entries);
-		re_head  = get_renames(o, head, common, head, merge, entries);
-		re_merge = get_renames(o, merge, common, head, merge, entries);
-		clean = process_renames(o, re_head, re_merge);
 		if (clean < 0)
 			goto cleanup;
 		for (i = entries->nr-1; 0 <= i; i--) {
@@ -2025,16 +3069,13 @@ int merge_trees(struct merge_options *o,
 		}
 
 cleanup:
-		string_list_clear(re_merge, 0);
-		string_list_clear(re_head, 0);
+		final_cleanup_renames(&re_info);
+
 		string_list_clear(entries, 1);
+		free(entries);
 
 		hashmap_free(&o->current_file_dir_set, 1);
 
-		free(re_merge);
-		free(re_head);
-		free(entries);
-
 		if (clean < 0)
 			return clean;
 	}
@@ -2070,7 +3111,7 @@ int merge_recursive(struct merge_options *o,
 {
 	struct commit_list *iter;
 	struct commit *merged_common_ancestors;
-	struct tree *mrtree = mrtree;
+	struct tree *mrtree;
 	int clean;
 
 	if (show(o, 4)) {
@@ -2198,11 +3239,13 @@ int merge_recursive_generic(struct merge_options *o,
 	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
 	clean = merge_recursive(o, head_commit, next_commit, ca,
 			result);
-	if (clean < 0)
+	if (clean < 0) {
+		rollback_lock_file(&lock);
 		return clean;
+	}
 
-	if (active_cache_changed &&
-	    write_locked_index(&the_index, &lock, COMMIT_LOCK))
+	if (write_locked_index(&the_index, &lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		return err(o, _("Unable to write index."));
 
 	return clean ? 0 : 1;
diff --git a/merge-recursive.h b/merge-recursive.h
index 80d69d1..d863cf8 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,6 +1,7 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
+#include "unpack-trees.h"
 #include "string-list.h"
 
 struct merge_options {
@@ -27,6 +28,32 @@ struct merge_options {
 	struct strbuf obuf;
 	struct hashmap current_file_dir_set;
 	struct string_list df_conflict_file_set;
+	struct unpack_trees_options unpack_opts;
+};
+
+/*
+ * For dir_rename_entry, directory names are stored as a full path from the
+ * toplevel of the repository and do not include a trailing '/'.  Also:
+ *
+ *   dir:                original name of directory being renamed
+ *   non_unique_new_dir: if true, could not determine new_dir
+ *   new_dir:            final name of directory being renamed
+ *   possible_new_dirs:  temporary used to help determine new_dir; see comments
+ *                       in get_directory_renames() for details
+ */
+struct dir_rename_entry {
+	struct hashmap_entry ent; /* must be the first member! */
+	char *dir;
+	unsigned non_unique_new_dir:1;
+	struct strbuf new_dir;
+	struct string_list possible_new_dirs;
+};
+
+struct collision_entry {
+	struct hashmap_entry ent; /* must be the first member! */
+	char *target_file;
+	struct string_list source_files;
+	unsigned reported_already:1;
 };
 
 /* merge_trees() but with recursive ancestor consolidation */
diff --git a/merge.c b/merge.c
index 195b578..f06a477 100644
--- a/merge.c
+++ b/merge.c
@@ -113,17 +113,23 @@ int checkout_fast_forward(const struct object_id *head,
 	setup_unpack_trees_porcelain(&opts, "merge");
 
 	trees[nr_trees] = parse_tree_indirect(head);
-	if (!trees[nr_trees++])
+	if (!trees[nr_trees++]) {
+		rollback_lock_file(&lock_file);
 		return -1;
+	}
 	trees[nr_trees] = parse_tree_indirect(remote);
-	if (!trees[nr_trees++])
+	if (!trees[nr_trees++]) {
+		rollback_lock_file(&lock_file);
 		return -1;
+	}
 	for (i = 0; i < nr_trees; i++) {
 		parse_tree(trees[i]);
 		init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
 	}
-	if (unpack_trees(nr_trees, t, &opts))
+	if (unpack_trees(nr_trees, t, &opts)) {
+		rollback_lock_file(&lock_file);
 		return -1;
+	}
 	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
 		return error(_("unable to write new index file"));
 	return 0;
diff --git a/name-hash.c b/name-hash.c
index 45c98db..1638498 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -578,6 +578,8 @@ static void threaded_lazy_init_name_hash(
 
 static void lazy_init_name_hash(struct index_state *istate)
 {
+	uint64_t start = getnanotime();
+
 	if (istate->name_hash_initialized)
 		return;
 	hashmap_init(&istate->name_hash, cache_entry_cmp, NULL, istate->cache_nr);
@@ -600,6 +602,7 @@ static void lazy_init_name_hash(struct index_state *istate)
 	}
 
 	istate->name_hash_initialized = 1;
+	trace_performance_since(start, "initialize name hash");
 }
 
 /*
@@ -696,12 +699,12 @@ void adjust_dirname_case(struct index_state *istate, char *name)
 		if (*ptr == '/') {
 			struct dir_entry *dir;
 
-			ptr++;
-			dir = find_dir_entry(istate, name, ptr - name + 1);
+			dir = find_dir_entry(istate, name, ptr - name);
 			if (dir) {
 				memcpy((void *)startPtr, dir->name + (startPtr - name), ptr - startPtr);
-				startPtr = ptr;
+				startPtr = ptr + 1;
 			}
+			ptr++;
 		}
 	}
 }
diff --git a/notes-cache.c b/notes-cache.c
index 17ee860..e61988e 100644
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -54,10 +54,10 @@ int notes_cache_write(struct notes_cache *c)
 	if (!c->tree.dirty)
 		return 0;
 
-	if (write_notes_tree(&c->tree, tree_oid.hash))
+	if (write_notes_tree(&c->tree, &tree_oid))
 		return -1;
-	if (commit_tree(c->validity, strlen(c->validity), tree_oid.hash, NULL,
-			commit_oid.hash, NULL, NULL) < 0)
+	if (commit_tree(c->validity, strlen(c->validity), &tree_oid, NULL,
+			&commit_oid, NULL, NULL) < 0)
 		return -1;
 	if (update_ref("update notes cache", c->tree.update_ref, &commit_oid,
 		       NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
@@ -77,7 +77,7 @@ char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
 	value_oid = get_note(&c->tree, key_oid);
 	if (!value_oid)
 		return NULL;
-	value = read_sha1_file(value_oid->hash, &type, &size);
+	value = read_object_file(value_oid, &type, &size);
 
 	*outsize = size;
 	return value;
@@ -88,7 +88,7 @@ int notes_cache_put(struct notes_cache *c, struct object_id *key_oid,
 {
 	struct object_id value_oid;
 
-	if (write_sha1_file(data, size, "blob", value_oid.hash) < 0)
+	if (write_object_file(data, size, "blob", &value_oid) < 0)
 		return -1;
 	return add_note(&c->tree, key_oid, &value_oid, NULL);
 }
diff --git a/notes-merge.c b/notes-merge.c
index 0f6573c..8e0726a 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -322,7 +322,7 @@ static void write_note_to_worktree(const struct object_id *obj,
 {
 	enum object_type type;
 	unsigned long size;
-	void *buf = read_sha1_file(note->hash, &type, &size);
+	void *buf = read_object_file(note, &type, &size);
 
 	if (!buf)
 		die("cannot read note %s for object %s",
@@ -642,9 +642,8 @@ int notes_merge(struct notes_merge_options *o,
 		struct commit_list *parents = NULL;
 		commit_list_insert(remote, &parents); /* LIFO order */
 		commit_list_insert(local, &parents);
-		create_notes_commit(local_tree, parents,
-				    o->commit_msg.buf, o->commit_msg.len,
-				    result_oid->hash);
+		create_notes_commit(local_tree, parents, o->commit_msg.buf,
+				    o->commit_msg.len, result_oid);
 	}
 
 found_result:
@@ -718,8 +717,8 @@ int notes_merge_commit(struct notes_merge_options *o,
 		strbuf_setlen(&path, baselen);
 	}
 
-	create_notes_commit(partial_tree, partial_commit->parents,
-			    msg, strlen(msg), result_oid->hash);
+	create_notes_commit(partial_tree, partial_commit->parents, msg,
+			    strlen(msg), result_oid);
 	unuse_commit_buffer(partial_commit, buffer);
 	if (o->verbosity >= 4)
 		printf("Finalized notes merge commit: %s\n",
diff --git a/notes-utils.c b/notes-utils.c
index 5c8e70c..02407fe 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -6,13 +6,13 @@
 
 void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
 			 const char *msg, size_t msg_len,
-			 unsigned char *result_sha1)
+			 struct object_id *result_oid)
 {
 	struct object_id tree_oid;
 
 	assert(t->initialized);
 
-	if (write_notes_tree(t, tree_oid.hash))
+	if (write_notes_tree(t, &tree_oid))
 		die("Failed to write notes tree to database");
 
 	if (!parents) {
@@ -27,7 +27,8 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
 		/* else: t->ref points to nothing, assume root/orphan commit */
 	}
 
-	if (commit_tree(msg, msg_len, tree_oid.hash, parents, result_sha1, NULL, NULL))
+	if (commit_tree(msg, msg_len, &tree_oid, parents, result_oid, NULL,
+			NULL))
 		die("Failed to commit notes tree to database");
 }
 
@@ -47,7 +48,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
 	strbuf_addstr(&buf, msg);
 	strbuf_complete_line(&buf);
 
-	create_notes_commit(t, NULL, buf.buf, buf.len, commit_oid.hash);
+	create_notes_commit(t, NULL, buf.buf, buf.len, &commit_oid);
 	strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
 	update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
 		   UPDATE_REFS_DIE_ON_ERR);
diff --git a/notes-utils.h b/notes-utils.h
index 1190578..5d79cbe 100644
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -15,7 +15,8 @@
  * The resulting commit SHA1 is stored in result_sha1.
  */
 void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
-			 const char *msg, size_t msg_len, unsigned char *result_sha1);
+			 const char *msg, size_t msg_len,
+			 struct object_id *result_oid);
 
 void commit_notes(struct notes_tree *t, const char *msg);
 
diff --git a/notes.c b/notes.c
index c7f21fa..a386d45 100644
--- a/notes.c
+++ b/notes.c
@@ -270,8 +270,8 @@ static int note_tree_insert(struct notes_tree *t, struct int_node *tree,
 				if (!oidcmp(&l->val_oid, &entry->val_oid))
 					return 0;
 
-				ret = combine_notes(l->val_oid.hash,
-						    entry->val_oid.hash);
+				ret = combine_notes(&l->val_oid,
+						    &entry->val_oid);
 				if (!ret && is_null_oid(&l->val_oid))
 					note_tree_remove(t, tree, n, entry);
 				free(entry);
@@ -667,7 +667,7 @@ static int tree_write_stack_finish_subtree(struct tree_write_stack *tws)
 		ret = tree_write_stack_finish_subtree(n);
 		if (ret)
 			return ret;
-		ret = write_sha1_file(n->buf.buf, n->buf.len, tree_type, s.hash);
+		ret = write_object_file(n->buf.buf, n->buf.len, tree_type, &s);
 		if (ret)
 			return ret;
 		strbuf_release(&n->buf);
@@ -786,8 +786,8 @@ static int prune_notes_helper(const struct object_id *object_oid,
 	return 0;
 }
 
-int combine_notes_concatenate(unsigned char *cur_sha1,
-		const unsigned char *new_sha1)
+int combine_notes_concatenate(struct object_id *cur_oid,
+			      const struct object_id *new_oid)
 {
 	char *cur_msg = NULL, *new_msg = NULL, *buf;
 	unsigned long cur_len, new_len, buf_len;
@@ -795,18 +795,18 @@ int combine_notes_concatenate(unsigned char *cur_sha1,
 	int ret;
 
 	/* read in both note blob objects */
-	if (!is_null_sha1(new_sha1))
-		new_msg = read_sha1_file(new_sha1, &new_type, &new_len);
+	if (!is_null_oid(new_oid))
+		new_msg = read_object_file(new_oid, &new_type, &new_len);
 	if (!new_msg || !new_len || new_type != OBJ_BLOB) {
 		free(new_msg);
 		return 0;
 	}
-	if (!is_null_sha1(cur_sha1))
-		cur_msg = read_sha1_file(cur_sha1, &cur_type, &cur_len);
+	if (!is_null_oid(cur_oid))
+		cur_msg = read_object_file(cur_oid, &cur_type, &cur_len);
 	if (!cur_msg || !cur_len || cur_type != OBJ_BLOB) {
 		free(cur_msg);
 		free(new_msg);
-		hashcpy(cur_sha1, new_sha1);
+		oidcpy(cur_oid, new_oid);
 		return 0;
 	}
 
@@ -825,20 +825,20 @@ int combine_notes_concatenate(unsigned char *cur_sha1,
 	free(new_msg);
 
 	/* create a new blob object from buf */
-	ret = write_sha1_file(buf, buf_len, blob_type, cur_sha1);
+	ret = write_object_file(buf, buf_len, blob_type, cur_oid);
 	free(buf);
 	return ret;
 }
 
-int combine_notes_overwrite(unsigned char *cur_sha1,
-		const unsigned char *new_sha1)
+int combine_notes_overwrite(struct object_id *cur_oid,
+			    const struct object_id *new_oid)
 {
-	hashcpy(cur_sha1, new_sha1);
+	oidcpy(cur_oid, new_oid);
 	return 0;
 }
 
-int combine_notes_ignore(unsigned char *cur_sha1,
-		const unsigned char *new_sha1)
+int combine_notes_ignore(struct object_id *cur_oid,
+			 const struct object_id *new_oid)
 {
 	return 0;
 }
@@ -848,17 +848,17 @@ int combine_notes_ignore(unsigned char *cur_sha1,
  * newlines removed.
  */
 static int string_list_add_note_lines(struct string_list *list,
-				      const unsigned char *sha1)
+				      const struct object_id *oid)
 {
 	char *data;
 	unsigned long len;
 	enum object_type t;
 
-	if (is_null_sha1(sha1))
+	if (is_null_oid(oid))
 		return 0;
 
 	/* read_sha1_file NUL-terminates */
-	data = read_sha1_file(sha1, &t, &len);
+	data = read_object_file(oid, &t, &len);
 	if (t != OBJ_BLOB || !data || !len) {
 		free(data);
 		return t != OBJ_BLOB || !data;
@@ -884,17 +884,17 @@ static int string_list_join_lines_helper(struct string_list_item *item,
 	return 0;
 }
 
-int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
-		const unsigned char *new_sha1)
+int combine_notes_cat_sort_uniq(struct object_id *cur_oid,
+				const struct object_id *new_oid)
 {
 	struct string_list sort_uniq_list = STRING_LIST_INIT_DUP;
 	struct strbuf buf = STRBUF_INIT;
 	int ret = 1;
 
 	/* read both note blob objects into unique_lines */
-	if (string_list_add_note_lines(&sort_uniq_list, cur_sha1))
+	if (string_list_add_note_lines(&sort_uniq_list, cur_oid))
 		goto out;
-	if (string_list_add_note_lines(&sort_uniq_list, new_sha1))
+	if (string_list_add_note_lines(&sort_uniq_list, new_oid))
 		goto out;
 	string_list_remove_empty_items(&sort_uniq_list, 0);
 	string_list_sort(&sort_uniq_list);
@@ -905,7 +905,7 @@ int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
 				 string_list_join_lines_helper, &buf))
 		goto out;
 
-	ret = write_sha1_file(buf.buf, buf.len, blob_type, cur_sha1);
+	ret = write_object_file(buf.buf, buf.len, blob_type, cur_oid);
 
 out:
 	strbuf_release(&buf);
@@ -1012,7 +1012,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
 		return;
 	if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
 		die("Cannot use notes ref %s", notes_ref);
-	if (get_tree_entry(object_oid.hash, "", oid.hash, &mode))
+	if (get_tree_entry(&object_oid, "", &oid, &mode))
 		die("Failed to read notes tree referenced by %s (%s)",
 		    notes_ref, oid_to_hex(&object_oid));
 
@@ -1123,11 +1123,12 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
 	return for_each_note_helper(t, t->root, 0, 0, flags, fn, cb_data);
 }
 
-int write_notes_tree(struct notes_tree *t, unsigned char *result)
+int write_notes_tree(struct notes_tree *t, struct object_id *result)
 {
 	struct tree_write_stack root;
 	struct write_each_note_data cb_data;
 	int ret;
+	int flags;
 
 	if (!t)
 		t = &default_notes_tree;
@@ -1141,12 +1142,12 @@ int write_notes_tree(struct notes_tree *t, unsigned char *result)
 	cb_data.next_non_note = t->first_non_note;
 
 	/* Write tree objects representing current notes tree */
-	ret = for_each_note(t, FOR_EACH_NOTE_DONT_UNPACK_SUBTREES |
-				FOR_EACH_NOTE_YIELD_SUBTREES,
-			write_each_note, &cb_data) ||
-		write_each_non_note_until(NULL, &cb_data) ||
-		tree_write_stack_finish_subtree(&root) ||
-		write_sha1_file(root.buf.buf, root.buf.len, tree_type, result);
+	flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES |
+		FOR_EACH_NOTE_YIELD_SUBTREES;
+	ret = for_each_note(t, flags, write_each_note, &cb_data) ||
+	      write_each_non_note_until(NULL, &cb_data) ||
+	      tree_write_stack_finish_subtree(&root) ||
+	      write_object_file(root.buf.buf, root.buf.len, tree_type, result);
 	strbuf_release(&root.buf);
 	return ret;
 }
@@ -1216,7 +1217,7 @@ static void format_note(struct notes_tree *t, const struct object_id *object_oid
 	if (!oid)
 		return;
 
-	if (!(msg = read_sha1_file(oid->hash, &type, &msglen)) || type != OBJ_BLOB) {
+	if (!(msg = read_object_file(oid, &type, &msglen)) || type != OBJ_BLOB) {
 		free(msg);
 		return;
 	}
diff --git a/notes.h b/notes.h
index 3848c2f..0433f45 100644
--- a/notes.h
+++ b/notes.h
@@ -9,27 +9,32 @@
  * When adding a new note annotating the same object as an existing note, it is
  * up to the caller to decide how to combine the two notes. The decision is
  * made by passing in a function of the following form. The function accepts
- * two SHA1s -- of the existing note and the new note, respectively. The
+ * two object_ids -- of the existing note and the new note, respectively. The
  * function then combines the notes in whatever way it sees fit, and writes the
- * resulting SHA1 into the first SHA1 argument (cur_sha1). A non-zero return
+ * resulting oid into the first argument (cur_oid). A non-zero return
  * value indicates failure.
  *
- * The two given SHA1s shall both be non-NULL and different from each other.
- * Either of them (but not both) may be == null_sha1, which indicates an
- * empty/non-existent note. If the resulting SHA1 (cur_sha1) is == null_sha1,
+ * The two given object_ids shall both be non-NULL and different from each
+ * other. Either of them (but not both) may be == null_oid, which indicates an
+ * empty/non-existent note. If the resulting oid (cur_oid) is == null_oid,
  * the note will be removed from the notes tree.
  *
  * The default combine_notes function (you get this when passing NULL) is
  * combine_notes_concatenate(), which appends the contents of the new note to
  * the contents of the existing note.
  */
-typedef int (*combine_notes_fn)(unsigned char *cur_sha1, const unsigned char *new_sha1);
+typedef int (*combine_notes_fn)(struct object_id *cur_oid,
+				const struct object_id *new_oid);
 
 /* Common notes combinators */
-int combine_notes_concatenate(unsigned char *cur_sha1, const unsigned char *new_sha1);
-int combine_notes_overwrite(unsigned char *cur_sha1, const unsigned char *new_sha1);
-int combine_notes_ignore(unsigned char *cur_sha1, const unsigned char *new_sha1);
-int combine_notes_cat_sort_uniq(unsigned char *cur_sha1, const unsigned char *new_sha1);
+int combine_notes_concatenate(struct object_id *cur_oid,
+			      const struct object_id *new_oid);
+int combine_notes_overwrite(struct object_id *cur_oid,
+			    const struct object_id *new_oid);
+int combine_notes_ignore(struct object_id *cur_oid,
+			 const struct object_id *new_oid);
+int combine_notes_cat_sort_uniq(struct object_id *cur_oid,
+				const struct object_id *new_oid);
 
 /*
  * Notes tree object
@@ -212,7 +217,7 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
  * Write the given notes_tree structure to the object database
  *
  * Creates a new tree object encapsulating the current state of the given
- * notes_tree, and stores its SHA1 into the 'result' argument.
+ * notes_tree, and stores its object id into the 'result' argument.
  *
  * Returns zero on success, non-zero on failure.
  *
@@ -220,7 +225,7 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
  * this function has returned zero. Please also remember to create a
  * corresponding commit object, and update the appropriate notes ref.
  */
-int write_notes_tree(struct notes_tree *t, unsigned char *result);
+int write_notes_tree(struct notes_tree *t, struct object_id *result);
 
 /* Flags controlling the operation of prune */
 #define NOTES_PRUNE_VERBOSE 1
diff --git a/object.c b/object.c
index 4c2cf7f..a0a756f 100644
--- a/object.c
+++ b/object.c
@@ -28,7 +28,7 @@ static const char *object_type_strings[] = {
 	"tag",		/* OBJ_TAG = 4 */
 };
 
-const char *typename(unsigned int type)
+const char *type_name(unsigned int type)
 {
 	if (type >= ARRAY_SIZE(object_type_strings))
 		return NULL;
@@ -168,7 +168,7 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet)
 		if (!quiet)
 			error("object %s is a %s, not a %s",
 			      oid_to_hex(&obj->oid),
-			      typename(obj->type), typename(type));
+			      type_name(obj->type), type_name(type));
 		return NULL;
 	}
 }
@@ -246,7 +246,7 @@ struct object *parse_object(const struct object_id *oid)
 	unsigned long size;
 	enum object_type type;
 	int eaten;
-	const unsigned char *repl = lookup_replace_object(oid->hash);
+	const struct object_id *repl = lookup_replace_object(oid);
 	void *buffer;
 	struct object *obj;
 
@@ -256,8 +256,8 @@ struct object *parse_object(const struct object_id *oid)
 
 	if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
 	    (!obj && has_object_file(oid) &&
-	     sha1_object_info(oid->hash, NULL) == OBJ_BLOB)) {
-		if (check_sha1_signature(repl, NULL, 0, NULL) < 0) {
+	     oid_object_info(oid, NULL) == OBJ_BLOB)) {
+		if (check_object_signature(repl, NULL, 0, NULL) < 0) {
 			error("sha1 mismatch %s", oid_to_hex(oid));
 			return NULL;
 		}
@@ -265,11 +265,11 @@ struct object *parse_object(const struct object_id *oid)
 		return lookup_object(oid->hash);
 	}
 
-	buffer = read_sha1_file(oid->hash, &type, &size);
+	buffer = read_object_file(oid, &type, &size);
 	if (buffer) {
-		if (check_sha1_signature(repl, buffer, size, typename(type)) < 0) {
+		if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
 			free(buffer);
-			error("sha1 mismatch %s", sha1_to_hex(repl));
+			error("sha1 mismatch %s", oid_to_hex(repl));
 			return NULL;
 		}
 
diff --git a/object.h b/object.h
index 87563d9..f13f85b 100644
--- a/object.h
+++ b/object.h
@@ -28,18 +28,22 @@ struct object_array {
 #define TYPE_BITS   3
 /*
  * object flag allocation:
- * revision.h:      0---------10                                26
- * fetch-pack.c:    0---5
- * walker.c:        0-2
- * upload-pack.c:       4       11----------------19
- * builtin/blame.c:               12-13
- * bisect.c:                               16
- * bundle.c:                               16
- * http-push.c:                            16-----19
- * commit.c:                               16-----19
- * sha1_name.c:                                     20
- * list-objects-filter.c:                             21
- * builtin/fsck.c:  0--3
+ * revision.h:               0---------10                                26
+ * fetch-pack.c:             0----5
+ * walker.c:                 0-2
+ * upload-pack.c:                4       11----------------19
+ * builtin/blame.c:                        12-13
+ * bisect.c:                                        16
+ * bundle.c:                                        16
+ * http-push.c:                                     16-----19
+ * commit.c:                                        16-----19
+ * sha1_name.c:                                              20
+ * list-objects-filter.c:                                      21
+ * builtin/fsck.c:           0--3
+ * builtin/index-pack.c:                                     2021
+ * builtin/pack-objects.c:                                   20
+ * builtin/reflog.c:                   10--12
+ * builtin/unpack-objects.c:                                 2021
  */
 #define FLAG_BITS  27
 
@@ -53,7 +57,7 @@ struct object {
 	struct object_id oid;
 };
 
-extern const char *typename(unsigned int type);
+extern const char *type_name(unsigned int type);
 extern int type_from_string_gently(const char *str, ssize_t, int gentle);
 #define type_from_string(str) type_from_string_gently(str, -1, 0)
 
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index a8df5ce..41ae27f 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -73,8 +73,7 @@ void bitmap_writer_build_type_index(struct pack_idx_entry **index,
 			break;
 
 		default:
-			real_type = sha1_object_info(entry->idx.oid.hash,
-						     NULL);
+			real_type = oid_object_info(&entry->idx.oid, NULL);
 			break;
 		}
 
@@ -440,19 +439,19 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
 }
 
 
-static int sha1write_ewah_helper(void *f, const void *buf, size_t len)
+static int hashwrite_ewah_helper(void *f, const void *buf, size_t len)
 {
-	/* sha1write will die on error */
-	sha1write(f, buf, len);
+	/* hashwrite will die on error */
+	hashwrite(f, buf, len);
 	return len;
 }
 
 /**
  * Write the bitmap index to disk
  */
-static inline void dump_bitmap(struct sha1file *f, struct ewah_bitmap *bitmap)
+static inline void dump_bitmap(struct hashfile *f, struct ewah_bitmap *bitmap)
 {
-	if (ewah_serialize_to(bitmap, sha1write_ewah_helper, f) < 0)
+	if (ewah_serialize_to(bitmap, hashwrite_ewah_helper, f) < 0)
 		die("Failed to write bitmap index");
 }
 
@@ -462,7 +461,7 @@ static const unsigned char *sha1_access(size_t pos, void *table)
 	return index[pos]->oid.hash;
 }
 
-static void write_selected_commits_v1(struct sha1file *f,
+static void write_selected_commits_v1(struct hashfile *f,
 				      struct pack_idx_entry **index,
 				      uint32_t index_nr)
 {
@@ -477,15 +476,15 @@ static void write_selected_commits_v1(struct sha1file *f,
 		if (commit_pos < 0)
 			die("BUG: trying to write commit not in index");
 
-		sha1write_be32(f, commit_pos);
-		sha1write_u8(f, stored->xor_offset);
-		sha1write_u8(f, stored->flags);
+		hashwrite_be32(f, commit_pos);
+		hashwrite_u8(f, stored->xor_offset);
+		hashwrite_u8(f, stored->flags);
 
 		dump_bitmap(f, stored->write_as);
 	}
 }
 
-static void write_hash_cache(struct sha1file *f,
+static void write_hash_cache(struct hashfile *f,
 			     struct pack_idx_entry **index,
 			     uint32_t index_nr)
 {
@@ -494,7 +493,7 @@ static void write_hash_cache(struct sha1file *f,
 	for (i = 0; i < index_nr; ++i) {
 		struct object_entry *entry = (struct object_entry *)index[i];
 		uint32_t hash_value = htonl(entry->hash);
-		sha1write(f, &hash_value, sizeof(hash_value));
+		hashwrite(f, &hash_value, sizeof(hash_value));
 	}
 }
 
@@ -511,13 +510,13 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
 	static uint16_t default_version = 1;
 	static uint16_t flags = BITMAP_OPT_FULL_DAG;
 	struct strbuf tmp_file = STRBUF_INIT;
-	struct sha1file *f;
+	struct hashfile *f;
 
 	struct bitmap_disk_header header;
 
 	int fd = odb_mkstemp(&tmp_file, "pack/tmp_bitmap_XXXXXX");
 
-	f = sha1fd(fd, tmp_file.buf);
+	f = hashfd(fd, tmp_file.buf);
 
 	memcpy(header.magic, BITMAP_IDX_SIGNATURE, sizeof(BITMAP_IDX_SIGNATURE));
 	header.version = htons(default_version);
@@ -525,7 +524,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
 	header.entry_count = htonl(writer.selected_nr);
 	hashcpy(header.checksum, writer.pack_checksum);
 
-	sha1write(f, &header, sizeof(header));
+	hashwrite(f, &header, sizeof(header));
 	dump_bitmap(f, writer.commits);
 	dump_bitmap(f, writer.trees);
 	dump_bitmap(f, writer.blobs);
@@ -535,7 +534,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
 	if (options & BITMAP_OPT_HASH_CACHE)
 		write_hash_cache(f, index, index_nr);
 
-	sha1close(f, NULL, CSUM_FSYNC);
+	hashclose(f, NULL, CSUM_FSYNC);
 
 	if (adjust_shared_perm(tmp_file.buf))
 		die_errno("unable to make temporary bitmap file readable");
diff --git a/pack-check.c b/pack-check.c
index 2378f25..385d964 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -42,7 +42,7 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
 	} while (len);
 
 	index_crc = p->index_data;
-	index_crc += 2 + 256 + p->num_objects * (20/4) + nr;
+	index_crc += 2 + 256 + p->num_objects * (the_hash_algo->rawsz/4) + nr;
 
 	return data_crc != ntohl(*index_crc);
 }
@@ -55,7 +55,7 @@ static int verify_packfile(struct packed_git *p,
 {
 	off_t index_size = p->index_size;
 	const unsigned char *index_base = p->index_data;
-	git_SHA_CTX ctx;
+	git_hash_ctx ctx;
 	unsigned char hash[GIT_MAX_RAWSZ], *pack_sig;
 	off_t offset = 0, pack_sig_ofs = 0;
 	uint32_t nr_objects, i;
@@ -65,24 +65,24 @@ static int verify_packfile(struct packed_git *p,
 	if (!is_pack_valid(p))
 		return error("packfile %s cannot be accessed", p->pack_name);
 
-	git_SHA1_Init(&ctx);
+	the_hash_algo->init_fn(&ctx);
 	do {
 		unsigned long remaining;
 		unsigned char *in = use_pack(p, w_curs, offset, &remaining);
 		offset += remaining;
 		if (!pack_sig_ofs)
-			pack_sig_ofs = p->pack_size - 20;
+			pack_sig_ofs = p->pack_size - the_hash_algo->rawsz;
 		if (offset > pack_sig_ofs)
 			remaining -= (unsigned int)(offset - pack_sig_ofs);
-		git_SHA1_Update(&ctx, in, remaining);
+		the_hash_algo->update_fn(&ctx, in, remaining);
 	} while (offset < pack_sig_ofs);
-	git_SHA1_Final(hash, &ctx);
+	the_hash_algo->final_fn(hash, &ctx);
 	pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
 	if (hashcmp(hash, pack_sig))
-		err = error("%s SHA1 checksum mismatch",
+		err = error("%s pack checksum mismatch",
 			    p->pack_name);
-	if (hashcmp(index_base + index_size - 40, pack_sig))
-		err = error("%s SHA1 does not match its index",
+	if (hashcmp(index_base + index_size - the_hash_algo->hexsz, pack_sig))
+		err = error("%s pack checksum does not match its index",
 			    p->pack_name);
 	unuse_pack(w_curs);
 
@@ -127,7 +127,7 @@ static int verify_packfile(struct packed_git *p,
 
 		if (type == OBJ_BLOB && big_file_threshold <= size) {
 			/*
-			 * Let check_sha1_signature() check it with
+			 * Let check_object_signature() check it with
 			 * the streaming interface; no point slurping
 			 * the data in-core only to discard.
 			 */
@@ -142,7 +142,7 @@ static int verify_packfile(struct packed_git *p,
 			err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
 				    oid_to_hex(entries[i].oid.oid), p->pack_name,
 				    (uintmax_t)entries[i].offset);
-		else if (check_sha1_signature(entries[i].oid.hash, data, size, typename(type)))
+		else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type)))
 			err = error("packed %s from %s is corrupt",
 				    oid_to_hex(entries[i].oid.oid), p->pack_name);
 		else if (fn) {
@@ -166,8 +166,8 @@ int verify_pack_index(struct packed_git *p)
 {
 	off_t index_size;
 	const unsigned char *index_base;
-	git_SHA_CTX ctx;
-	unsigned char sha1[20];
+	git_hash_ctx ctx;
+	unsigned char hash[GIT_MAX_RAWSZ];
 	int err = 0;
 
 	if (open_pack_index(p))
@@ -176,11 +176,11 @@ int verify_pack_index(struct packed_git *p)
 	index_base = p->index_data;
 
 	/* Verify SHA1 sum of the index file */
-	git_SHA1_Init(&ctx);
-	git_SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20));
-	git_SHA1_Final(sha1, &ctx);
-	if (hashcmp(sha1, index_base + index_size - 20))
-		err = error("Packfile index for %s SHA1 mismatch",
+	the_hash_algo->init_fn(&ctx);
+	the_hash_algo->update_fn(&ctx, index_base, (unsigned int)(index_size - the_hash_algo->rawsz));
+	the_hash_algo->final_fn(hash, &ctx);
+	if (hashcmp(hash, index_base + index_size - the_hash_algo->rawsz))
+		err = error("Packfile index for %s hash mismatch",
 			    p->pack_name);
 	return err;
 }
diff --git a/pack-write.c b/pack-write.c
index fea6284..d775c74 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -46,7 +46,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 			   int nr_objects, const struct pack_idx_option *opts,
 			   const unsigned char *sha1)
 {
-	struct sha1file *f;
+	struct hashfile *f;
 	struct pack_idx_entry **sorted_by_sha, **list, **last;
 	off_t last_obj_offset = 0;
 	uint32_t array[256];
@@ -68,7 +68,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 
 	if (opts->flags & WRITE_IDX_VERIFY) {
 		assert(index_name);
-		f = sha1fd_check(index_name);
+		f = hashfd_check(index_name);
 	} else {
 		if (!index_name) {
 			struct strbuf tmp_file = STRBUF_INIT;
@@ -80,7 +80,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 			if (fd < 0)
 				die_errno("unable to create '%s'", index_name);
 		}
-		f = sha1fd(fd, index_name);
+		f = hashfd(fd, index_name);
 	}
 
 	/* if last object's offset is >= 2^31 we should use index V2 */
@@ -91,7 +91,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		struct pack_idx_header hdr;
 		hdr.idx_signature = htonl(PACK_IDX_SIGNATURE);
 		hdr.idx_version = htonl(index_version);
-		sha1write(f, &hdr, sizeof(hdr));
+		hashwrite(f, &hdr, sizeof(hdr));
 	}
 
 	/*
@@ -110,7 +110,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		array[i] = htonl(next - sorted_by_sha);
 		list = next;
 	}
-	sha1write(f, array, 256 * 4);
+	hashwrite(f, array, 256 * 4);
 
 	/*
 	 * Write the actual SHA1 entries..
@@ -120,9 +120,9 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		struct pack_idx_entry *obj = *list++;
 		if (index_version < 2) {
 			uint32_t offset = htonl(obj->offset);
-			sha1write(f, &offset, 4);
+			hashwrite(f, &offset, 4);
 		}
-		sha1write(f, obj->oid.hash, 20);
+		hashwrite(f, obj->oid.hash, the_hash_algo->rawsz);
 		if ((opts->flags & WRITE_IDX_STRICT) &&
 		    (i && !oidcmp(&list[-2]->oid, &obj->oid)))
 			die("The same object %s appears twice in the pack",
@@ -137,7 +137,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		for (i = 0; i < nr_objects; i++) {
 			struct pack_idx_entry *obj = *list++;
 			uint32_t crc32_val = htonl(obj->crc32);
-			sha1write(f, &crc32_val, 4);
+			hashwrite(f, &crc32_val, 4);
 		}
 
 		/* write the 32-bit offset table */
@@ -150,7 +150,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 				  ? (0x80000000 | nr_large_offset++)
 				  : obj->offset);
 			offset = htonl(offset);
-			sha1write(f, &offset, 4);
+			hashwrite(f, &offset, 4);
 		}
 
 		/* write the large offset table */
@@ -164,25 +164,25 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 				continue;
 			split[0] = htonl(offset >> 32);
 			split[1] = htonl(offset & 0xffffffff);
-			sha1write(f, split, 8);
+			hashwrite(f, split, 8);
 			nr_large_offset--;
 		}
 	}
 
-	sha1write(f, sha1, 20);
-	sha1close(f, NULL, ((opts->flags & WRITE_IDX_VERIFY)
+	hashwrite(f, sha1, the_hash_algo->rawsz);
+	hashclose(f, NULL, ((opts->flags & WRITE_IDX_VERIFY)
 			    ? CSUM_CLOSE : CSUM_FSYNC));
 	return index_name;
 }
 
-off_t write_pack_header(struct sha1file *f, uint32_t nr_entries)
+off_t write_pack_header(struct hashfile *f, uint32_t nr_entries)
 {
 	struct pack_header hdr;
 
 	hdr.hdr_signature = htonl(PACK_SIGNATURE);
 	hdr.hdr_version = htonl(PACK_VERSION);
 	hdr.hdr_entries = htonl(nr_entries);
-	sha1write(f, &hdr, sizeof(hdr));
+	hashwrite(f, &hdr, sizeof(hdr));
 	return sizeof(hdr);
 }
 
@@ -203,20 +203,20 @@ off_t write_pack_header(struct sha1file *f, uint32_t nr_entries)
  * interested in the resulting SHA1 of pack data above partial_pack_offset.
  */
 void fixup_pack_header_footer(int pack_fd,
-			 unsigned char *new_pack_sha1,
+			 unsigned char *new_pack_hash,
 			 const char *pack_name,
 			 uint32_t object_count,
-			 unsigned char *partial_pack_sha1,
+			 unsigned char *partial_pack_hash,
 			 off_t partial_pack_offset)
 {
 	int aligned_sz, buf_sz = 8 * 1024;
-	git_SHA_CTX old_sha1_ctx, new_sha1_ctx;
+	git_hash_ctx old_hash_ctx, new_hash_ctx;
 	struct pack_header hdr;
 	char *buf;
 	ssize_t read_result;
 
-	git_SHA1_Init(&old_sha1_ctx);
-	git_SHA1_Init(&new_sha1_ctx);
+	the_hash_algo->init_fn(&old_hash_ctx);
+	the_hash_algo->init_fn(&new_hash_ctx);
 
 	if (lseek(pack_fd, 0, SEEK_SET) != 0)
 		die_errno("Failed seeking to start of '%s'", pack_name);
@@ -228,9 +228,9 @@ void fixup_pack_header_footer(int pack_fd,
 			  pack_name);
 	if (lseek(pack_fd, 0, SEEK_SET) != 0)
 		die_errno("Failed seeking to start of '%s'", pack_name);
-	git_SHA1_Update(&old_sha1_ctx, &hdr, sizeof(hdr));
+	the_hash_algo->update_fn(&old_hash_ctx, &hdr, sizeof(hdr));
 	hdr.hdr_entries = htonl(object_count);
-	git_SHA1_Update(&new_sha1_ctx, &hdr, sizeof(hdr));
+	the_hash_algo->update_fn(&new_hash_ctx, &hdr, sizeof(hdr));
 	write_or_die(pack_fd, &hdr, sizeof(hdr));
 	partial_pack_offset -= sizeof(hdr);
 
@@ -238,28 +238,28 @@ void fixup_pack_header_footer(int pack_fd,
 	aligned_sz = buf_sz - sizeof(hdr);
 	for (;;) {
 		ssize_t m, n;
-		m = (partial_pack_sha1 && partial_pack_offset < aligned_sz) ?
+		m = (partial_pack_hash && partial_pack_offset < aligned_sz) ?
 			partial_pack_offset : aligned_sz;
 		n = xread(pack_fd, buf, m);
 		if (!n)
 			break;
 		if (n < 0)
 			die_errno("Failed to checksum '%s'", pack_name);
-		git_SHA1_Update(&new_sha1_ctx, buf, n);
+		the_hash_algo->update_fn(&new_hash_ctx, buf, n);
 
 		aligned_sz -= n;
 		if (!aligned_sz)
 			aligned_sz = buf_sz;
 
-		if (!partial_pack_sha1)
+		if (!partial_pack_hash)
 			continue;
 
-		git_SHA1_Update(&old_sha1_ctx, buf, n);
+		the_hash_algo->update_fn(&old_hash_ctx, buf, n);
 		partial_pack_offset -= n;
 		if (partial_pack_offset == 0) {
-			unsigned char sha1[20];
-			git_SHA1_Final(sha1, &old_sha1_ctx);
-			if (hashcmp(sha1, partial_pack_sha1) != 0)
+			unsigned char hash[GIT_MAX_RAWSZ];
+			the_hash_algo->final_fn(hash, &old_hash_ctx);
+			if (hashcmp(hash, partial_pack_hash) != 0)
 				die("Unexpected checksum for %s "
 				    "(disk corruption?)", pack_name);
 			/*
@@ -267,23 +267,24 @@ void fixup_pack_header_footer(int pack_fd,
 			 * pack, which also means making partial_pack_offset
 			 * big enough not to matter anymore.
 			 */
-			git_SHA1_Init(&old_sha1_ctx);
+			the_hash_algo->init_fn(&old_hash_ctx);
 			partial_pack_offset = ~partial_pack_offset;
 			partial_pack_offset -= MSB(partial_pack_offset, 1);
 		}
 	}
 	free(buf);
 
-	if (partial_pack_sha1)
-		git_SHA1_Final(partial_pack_sha1, &old_sha1_ctx);
-	git_SHA1_Final(new_pack_sha1, &new_sha1_ctx);
-	write_or_die(pack_fd, new_pack_sha1, 20);
+	if (partial_pack_hash)
+		the_hash_algo->final_fn(partial_pack_hash, &old_hash_ctx);
+	the_hash_algo->final_fn(new_pack_hash, &new_hash_ctx);
+	write_or_die(pack_fd, new_pack_hash, the_hash_algo->rawsz);
 	fsync_or_die(pack_fd, pack_name);
 }
 
 char *index_pack_lockfile(int ip_out)
 {
-	char packname[46];
+	char packname[GIT_MAX_HEXSZ + 6];
+	const int len = the_hash_algo->hexsz + 6;
 
 	/*
 	 * The first thing we expect from index-pack's output
@@ -292,9 +293,9 @@ char *index_pack_lockfile(int ip_out)
 	 * case, we need it to remove the corresponding .keep file
 	 * later on.  If we don't get that then tough luck with it.
 	 */
-	if (read_in_full(ip_out, packname, 46) == 46 && packname[45] == '\n') {
+	if (read_in_full(ip_out, packname, len) == len && packname[len-1] == '\n') {
 		const char *name;
-		packname[45] = 0;
+		packname[len-1] = 0;
 		if (skip_prefix(packname, "keep\t", &name))
 			return xstrfmt("%s/pack/pack-%s.keep",
 				       get_object_directory(), name);
@@ -332,14 +333,14 @@ int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
 	return n;
 }
 
-struct sha1file *create_tmp_packfile(char **pack_tmp_name)
+struct hashfile *create_tmp_packfile(char **pack_tmp_name)
 {
 	struct strbuf tmpname = STRBUF_INIT;
 	int fd;
 
 	fd = odb_mkstemp(&tmpname, "pack/tmp_pack_XXXXXX");
 	*pack_tmp_name = strbuf_detach(&tmpname, NULL);
-	return sha1fd(fd, *pack_tmp_name);
+	return hashfd(fd, *pack_tmp_name);
 }
 
 void finish_tmp_packfile(struct strbuf *name_buffer,
diff --git a/pack.h b/pack.h
index 8294341..34a9d45 100644
--- a/pack.h
+++ b/pack.h
@@ -81,7 +81,7 @@ extern const char *write_idx_file(const char *index_name, struct pack_idx_entry
 extern int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr);
 extern int verify_pack_index(struct packed_git *);
 extern int verify_pack(struct packed_git *, verify_fn fn, struct progress *, uint32_t);
-extern off_t write_pack_header(struct sha1file *f, uint32_t);
+extern off_t write_pack_header(struct hashfile *f, uint32_t);
 extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t);
 extern char *index_pack_lockfile(int fd);
 
@@ -98,7 +98,7 @@ extern int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
 #define PH_ERROR_PROTOCOL	(-3)
 extern int read_pack_header(int fd, struct pack_header *);
 
-extern struct sha1file *create_tmp_packfile(char **pack_tmp_name);
+extern struct hashfile *create_tmp_packfile(char **pack_tmp_name);
 extern void finish_tmp_packfile(struct strbuf *name_buffer, const char *pack_tmp_name, struct pack_idx_entry **written_list, uint32_t nr_written, struct pack_idx_option *pack_idx_opts, unsigned char sha1[]);
 
 #endif
diff --git a/packfile.c b/packfile.c
index d087eac..8e8b743 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1105,13 +1105,13 @@ static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
 {
 	int type;
 	struct revindex_entry *revidx;
-	const unsigned char *sha1;
+	struct object_id oid;
 	revidx = find_pack_revindex(p, obj_offset);
 	if (!revidx)
 		return OBJ_BAD;
-	sha1 = nth_packed_object_sha1(p, revidx->nr);
-	mark_bad_packed_object(p, sha1);
-	type = sha1_object_info(sha1, NULL);
+	nth_packed_object_oid(&oid, p, revidx->nr);
+	mark_bad_packed_object(p, oid.hash);
+	type = oid_object_info(&oid, NULL);
 	if (type <= OBJ_NONE)
 		return OBJ_BAD;
 	return type;
@@ -1371,16 +1371,16 @@ int packed_object_info(struct packed_git *p, off_t obj_offset,
 		*oi->disk_sizep = revidx[1].offset - obj_offset;
 	}
 
-	if (oi->typep || oi->typename) {
+	if (oi->typep || oi->type_name) {
 		enum object_type ptot;
 		ptot = packed_to_object_type(p, obj_offset, type, &w_curs,
 					     curpos);
 		if (oi->typep)
 			*oi->typep = ptot;
-		if (oi->typename) {
-			const char *tn = typename(ptot);
+		if (oi->type_name) {
+			const char *tn = type_name(ptot);
 			if (tn)
-				strbuf_addstr(oi->typename, tn);
+				strbuf_addstr(oi->type_name, tn);
 		}
 		if (ptot < 0) {
 			type = OBJ_BAD;
@@ -1462,7 +1462,7 @@ struct unpack_entry_stack_ent {
 	unsigned long size;
 };
 
-static void *read_object(const unsigned char *sha1, enum object_type *type,
+static void *read_object(const struct object_id *oid, enum object_type *type,
 			 unsigned long *size)
 {
 	struct object_info oi = OBJECT_INFO_INIT;
@@ -1471,7 +1471,7 @@ static void *read_object(const unsigned char *sha1, enum object_type *type,
 	oi.sizep = size;
 	oi.contentp = &content;
 
-	if (sha1_object_info_extended(sha1, &oi, 0) < 0)
+	if (oid_object_info_extended(oid, &oi, 0) < 0)
 		return NULL;
 	return content;
 }
@@ -1511,11 +1511,11 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 			struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
 			off_t len = revidx[1].offset - obj_offset;
 			if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
-				const unsigned char *sha1 =
-					nth_packed_object_sha1(p, revidx->nr);
+				struct object_id oid;
+				nth_packed_object_oid(&oid, p, revidx->nr);
 				error("bad packed object CRC for %s",
-				      sha1_to_hex(sha1));
-				mark_bad_packed_object(p, sha1);
+				      oid_to_hex(&oid));
+				mark_bad_packed_object(p, oid.hash);
 				data = NULL;
 				goto out;
 			}
@@ -1598,16 +1598,16 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 			 * of a corrupted pack, and is better than failing outright.
 			 */
 			struct revindex_entry *revidx;
-			const unsigned char *base_sha1;
+			struct object_id base_oid;
 			revidx = find_pack_revindex(p, obj_offset);
 			if (revidx) {
-				base_sha1 = nth_packed_object_sha1(p, revidx->nr);
+				nth_packed_object_oid(&base_oid, p, revidx->nr);
 				error("failed to read delta base object %s"
 				      " at offset %"PRIuMAX" from %s",
-				      sha1_to_hex(base_sha1), (uintmax_t)obj_offset,
+				      oid_to_hex(&base_oid), (uintmax_t)obj_offset,
 				      p->pack_name);
-				mark_bad_packed_object(p, base_sha1);
-				base = read_object(base_sha1, &type, &base_size);
+				mark_bad_packed_object(p, base_oid.hash);
+				base = read_object(&base_oid, &type, &base_size);
 				external_base = base;
 			}
 		}
@@ -1664,6 +1664,29 @@ out:
 	return data;
 }
 
+int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32_t *result)
+{
+	const unsigned char *index_fanout = p->index_data;
+	const unsigned char *index_lookup;
+	int index_lookup_width;
+
+	if (!index_fanout)
+		BUG("bsearch_pack called without a valid pack-index");
+
+	index_lookup = index_fanout + 4 * 256;
+	if (p->index_version == 1) {
+		index_lookup_width = 24;
+		index_lookup += 4;
+	} else {
+		index_lookup_width = 20;
+		index_fanout += 8;
+		index_lookup += 8;
+	}
+
+	return bsearch_hash(oid->hash, (const uint32_t*)index_fanout,
+			    index_lookup, index_lookup_width, result);
+}
+
 const unsigned char *nth_packed_object_sha1(struct packed_git *p,
 					    uint32_t n)
 {
@@ -1730,52 +1753,18 @@ off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n)
 off_t find_pack_entry_one(const unsigned char *sha1,
 				  struct packed_git *p)
 {
-	const uint32_t *level1_ofs = p->index_data;
 	const unsigned char *index = p->index_data;
-	unsigned hi, lo, stride;
-	static int debug_lookup = -1;
-
-	if (debug_lookup < 0)
-		debug_lookup = !!getenv("GIT_DEBUG_LOOKUP");
+	struct object_id oid;
+	uint32_t result;
 
 	if (!index) {
 		if (open_pack_index(p))
 			return 0;
-		level1_ofs = p->index_data;
-		index = p->index_data;
-	}
-	if (p->index_version > 1) {
-		level1_ofs += 2;
-		index += 8;
-	}
-	index += 4 * 256;
-	hi = ntohl(level1_ofs[*sha1]);
-	lo = ((*sha1 == 0x0) ? 0 : ntohl(level1_ofs[*sha1 - 1]));
-	if (p->index_version > 1) {
-		stride = 20;
-	} else {
-		stride = 24;
-		index += 4;
 	}
 
-	if (debug_lookup)
-		printf("%02x%02x%02x... lo %u hi %u nr %"PRIu32"\n",
-		       sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
-
-	while (lo < hi) {
-		unsigned mi = lo + (hi - lo) / 2;
-		int cmp = hashcmp(index + mi * stride, sha1);
-
-		if (debug_lookup)
-			printf("lo %u hi %u rg %u mi %u\n",
-			       lo, hi, hi - lo, mi);
-		if (!cmp)
-			return nth_packed_object_offset(p, mi);
-		if (cmp > 0)
-			hi = mi;
-		else
-			lo = mi+1;
-	}
+	hashcpy(oid.hash, sha1);
+	if (bsearch_pack(&oid, p, &result))
+		return nth_packed_object_offset(p, result);
 	return 0;
 }
 
diff --git a/packfile.h b/packfile.h
index 5b1ce00..a7abd60 100644
--- a/packfile.h
+++ b/packfile.h
@@ -82,6 +82,14 @@ extern struct packed_git *add_packed_git(const char *path, size_t path_len, int
 extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
 
 /*
+ * Perform binary search on a pack-index for a given oid. Packfile is expected to
+ * have a valid pack-index.
+ *
+ * See 'bsearch_hash' for more information.
+ */
+int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32_t *result);
+
+/*
  * Return the SHA-1 of the nth object within the specified packfile.
  * Open the index if it is not already open.  The return value points
  * at the SHA-1 within the mmapped index.  Return NULL if there is an
diff --git a/parse-options.c b/parse-options.c
index d02eb8b..0f7059a 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -317,14 +317,16 @@ is_abbreviated:
 		return get_value(p, options, all_opts, flags ^ opt_flags);
 	}
 
-	if (ambiguous_option)
-		return error("Ambiguous option: %s "
+	if (ambiguous_option) {
+		error("Ambiguous option: %s "
 			"(could be --%s%s or --%s%s)",
 			arg,
 			(ambiguous_flags & OPT_UNSET) ?  "no-" : "",
 			ambiguous_option->long_name,
 			(abbrev_flags & OPT_UNSET) ?  "no-" : "",
 			abbrev_option->long_name);
+		return -3;
+	}
 	if (abbrev_option)
 		return get_value(p, abbrev_option, all_opts, abbrev_flags);
 	return -2;
@@ -425,6 +427,48 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
 	parse_options_check(options);
 }
 
+/*
+ * TODO: we are not completing the --no-XXX form yet because there are
+ * many options that do not suppress it properly.
+ */
+static int show_gitcomp(struct parse_opt_ctx_t *ctx,
+			const struct option *opts)
+{
+	for (; opts->type != OPTION_END; opts++) {
+		const char *suffix = "";
+
+		if (!opts->long_name)
+			continue;
+		if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))
+			continue;
+
+		switch (opts->type) {
+		case OPTION_GROUP:
+			continue;
+		case OPTION_STRING:
+		case OPTION_FILENAME:
+		case OPTION_INTEGER:
+		case OPTION_MAGNITUDE:
+		case OPTION_CALLBACK:
+			if (opts->flags & PARSE_OPT_NOARG)
+				break;
+			if (opts->flags & PARSE_OPT_OPTARG)
+				break;
+			if (opts->flags & PARSE_OPT_LASTARG_DEFAULT)
+				break;
+			suffix = "=";
+			break;
+		default:
+			break;
+		}
+		if (opts->flags & PARSE_OPT_COMP_ARG)
+			suffix = "=";
+		printf(" --%s%s", opts->long_name, suffix);
+	}
+	fputc('\n', stdout);
+	exit(0);
+}
+
 static int usage_with_options_internal(struct parse_opt_ctx_t *,
 				       const char * const *,
 				       const struct option *, int, int);
@@ -434,7 +478,6 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 		       const char * const usagestr[])
 {
 	int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
-	int err = 0;
 
 	/* we must reset ->opt, unknown short option leave it dangling */
 	ctx->opt = NULL;
@@ -455,11 +498,15 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 		if (internal_help && ctx->total == 1 && !strcmp(arg + 1, "h"))
 			goto show_usage;
 
+		/* lone --git-completion-helper is asked by git-completion.bash */
+		if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper"))
+			return show_gitcomp(ctx, options);
+
 		if (arg[1] != '-') {
 			ctx->opt = arg + 1;
 			switch (parse_short_opt(ctx, options)) {
 			case -1:
-				goto show_usage_error;
+				return PARSE_OPT_ERROR;
 			case -2:
 				if (ctx->opt)
 					check_typos(arg + 1, options);
@@ -472,7 +519,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 			while (ctx->opt) {
 				switch (parse_short_opt(ctx, options)) {
 				case -1:
-					goto show_usage_error;
+					return PARSE_OPT_ERROR;
 				case -2:
 					if (internal_help && *ctx->opt == 'h')
 						goto show_usage;
@@ -504,9 +551,11 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 			goto show_usage;
 		switch (parse_long_opt(ctx, arg + 2, options)) {
 		case -1:
-			goto show_usage_error;
+			return PARSE_OPT_ERROR;
 		case -2:
 			goto unknown;
+		case -3:
+			goto show_usage;
 		}
 		continue;
 unknown:
@@ -517,10 +566,8 @@ unknown:
 	}
 	return PARSE_OPT_DONE;
 
- show_usage_error:
-	err = 1;
  show_usage:
-	return usage_with_options_internal(ctx, usagestr, options, 0, err);
+	return usage_with_options_internal(ctx, usagestr, options, 0, 0);
 }
 
 int parse_options_end(struct parse_opt_ctx_t *ctx)
@@ -539,6 +586,7 @@ int parse_options(int argc, const char **argv, const char *prefix,
 	parse_options_start(&ctx, argc, argv, prefix, options, flags);
 	switch (parse_options_step(&ctx, options, usagestr)) {
 	case PARSE_OPT_HELP:
+	case PARSE_OPT_ERROR:
 		exit(129);
 	case PARSE_OPT_NON_OPTION:
 	case PARSE_OPT_DONE:
diff --git a/parse-options.h b/parse-options.h
index af71122..dd14911 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -38,7 +38,9 @@ enum parse_opt_option_flags {
 	PARSE_OPT_LASTARG_DEFAULT = 16,
 	PARSE_OPT_NODASH = 32,
 	PARSE_OPT_LITERAL_ARGHELP = 64,
-	PARSE_OPT_SHELL_EVAL = 256
+	PARSE_OPT_SHELL_EVAL = 256,
+	PARSE_OPT_NOCOMPLETE = 512,
+	PARSE_OPT_COMP_ARG = 1024
 };
 
 struct option;
@@ -89,6 +91,11 @@ typedef int parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
  *   PARSE_OPT_LITERAL_ARGHELP: says that argh shouldn't be enclosed in brackets
  *				(i.e. '<argh>') in the help message.
  *				Useful for options with multiple parameters.
+ *   PARSE_OPT_NOCOMPLETE: by default all visible options are completable
+ *			   by git-completion.bash. This option suppresses that.
+ *   PARSE_OPT_COMP_ARG: this option forces to git-completion.bash to
+ *			 complete an option as --name= not --name even if
+ *			 the option takes optional argument.
  *
  * `callback`::
  *   pointer to the callback to use for OPTION_CALLBACK or
@@ -112,19 +119,24 @@ struct option {
 	intptr_t defval;
 };
 
+#define OPT_BIT_F(s, l, v, h, b, f) { OPTION_BIT, (s), (l), (v), NULL, (h), \
+				      PARSE_OPT_NOARG|(f), NULL, (b) }
+#define OPT_COUNTUP_F(s, l, v, h, f) { OPTION_COUNTUP, (s), (l), (v), NULL, \
+				       (h), PARSE_OPT_NOARG|(f) }
+#define OPT_SET_INT_F(s, l, v, h, i, f) { OPTION_SET_INT, (s), (l), (v), NULL, \
+					  (h), PARSE_OPT_NOARG | (f), NULL, (i) }
+#define OPT_BOOL_F(s, l, v, h, f)   OPT_SET_INT_F(s, l, v, h, 1, f)
+
 #define OPT_END()                   { OPTION_END }
 #define OPT_ARGUMENT(l, h)          { OPTION_ARGUMENT, 0, (l), NULL, NULL, \
 				      (h), PARSE_OPT_NOARG}
 #define OPT_GROUP(h)                { OPTION_GROUP, 0, NULL, NULL, NULL, (h) }
-#define OPT_BIT(s, l, v, h, b)      { OPTION_BIT, (s), (l), (v), NULL, (h), \
-				      PARSE_OPT_NOARG, NULL, (b) }
+#define OPT_BIT(s, l, v, h, b)      OPT_BIT_F(s, l, v, h, b, 0)
 #define OPT_NEGBIT(s, l, v, h, b)   { OPTION_NEGBIT, (s), (l), (v), NULL, \
 				      (h), PARSE_OPT_NOARG, NULL, (b) }
-#define OPT_COUNTUP(s, l, v, h)     { OPTION_COUNTUP, (s), (l), (v), NULL, \
-				      (h), PARSE_OPT_NOARG }
-#define OPT_SET_INT(s, l, v, h, i)  { OPTION_SET_INT, (s), (l), (v), NULL, \
-				      (h), PARSE_OPT_NOARG, NULL, (i) }
-#define OPT_BOOL(s, l, v, h)        OPT_SET_INT(s, l, v, h, 1)
+#define OPT_COUNTUP(s, l, v, h)     OPT_COUNTUP_F(s, l, v, h, 0)
+#define OPT_SET_INT(s, l, v, h, i)  OPT_SET_INT_F(s, l, v, h, i, 0)
+#define OPT_BOOL(s, l, v, h)        OPT_BOOL_F(s, l, v, h, 0)
 #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
 				      (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
 #define OPT_CMDMODE(s, l, v, h, i)  { OPTION_CMDMODE, (s), (l), (v), NULL, \
@@ -188,6 +200,7 @@ enum {
 	PARSE_OPT_HELP = -1,
 	PARSE_OPT_DONE,
 	PARSE_OPT_NON_OPTION,
+	PARSE_OPT_ERROR,
 	PARSE_OPT_UNKNOWN
 };
 
@@ -240,7 +253,7 @@ extern int parse_opt_passthru_argv(const struct option *, const char *, int);
 	{ OPTION_CALLBACK, 'q', "quiet", (var), NULL, N_("be more quiet"), \
 	  PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }
 #define OPT__DRY_RUN(var, h)  OPT_BOOL('n', "dry-run", (var), (h))
-#define OPT__FORCE(var, h)    OPT_COUNTUP('f', "force",   (var), (h))
+#define OPT__FORCE(var, h, f) OPT_COUNTUP_F('f', "force",   (var), (h), (f))
 #define OPT__ABBREV(var)  \
 	{ OPTION_CALLBACK, 0, "abbrev", (var), N_("n"),	\
 	  N_("use <n> digits to display SHA-1s"),	\
diff --git a/perl/FromCPAN/.gitattributes b/perl/FromCPAN/.gitattributes
new file mode 100644
index 0000000..8b64fc5
--- /dev/null
+++ b/perl/FromCPAN/.gitattributes
@@ -0,0 +1 @@
+/Error.pm whitespace=-blank-at-eof
diff --git a/perl/Git/FromCPAN/Error.pm b/perl/FromCPAN/Error.pm
index 6098135..8b95e2d 100644
--- a/perl/Git/FromCPAN/Error.pm
+++ b/perl/FromCPAN/Error.pm
@@ -12,10 +12,12 @@
 package Error;
 
 use strict;
+use warnings;
+
 use vars qw($VERSION);
 use 5.004;
 
-$VERSION = "0.15009";
+$VERSION = "0.17025";
 
 use overload (
 	'""'	   =>	'stringify',
@@ -32,21 +34,35 @@ $Error::THROWN = undef;	# last error thrown, a workaround until die $ref works
 my $LAST;		# Last error created
 my %ERROR;		# Last error associated with package
 
-sub throw_Error_Simple
+sub _throw_Error_Simple
 {
     my $args = shift;
     return Error::Simple->new($args->{'text'});
 }
 
-$Error::ObjectifyCallback = \&throw_Error_Simple;
+$Error::ObjectifyCallback = \&_throw_Error_Simple;
 
 
 # Exported subs are defined in Error::subs
 
+use Scalar::Util ();
+
 sub import {
     shift;
+    my @tags = @_;
     local $Exporter::ExportLevel = $Exporter::ExportLevel + 1;
-    Error::subs->import(@_);
+
+    @tags = grep {
+       if( $_ eq ':warndie' ) {
+          Error::WarnDie->import();
+          0;
+       }
+       else {
+          1;
+       }
+    } @tags;
+
+    Error::subs->import(@tags);
 }
 
 # I really want to use last for the name of this method, but it is a keyword
@@ -107,10 +123,6 @@ sub stacktrace {
     $text;
 }
 
-# Allow error propagation, ie
-#
-# $ber->encode(...) or
-#    return Error->prior($ber)->associate($ldap);
 
 sub associate {
     my $err = shift;
@@ -130,6 +142,7 @@ sub associate {
     return;
 }
 
+
 sub new {
     my $self = shift;
     my($pkg,$file,$line) = caller($Error::Depth);
@@ -246,6 +259,10 @@ sub value {
 
 package Error::Simple;
 
+use vars qw($VERSION);
+
+$VERSION = "0.17025";
+
 @Error::Simple::ISA = qw(Error);
 
 sub new {
@@ -288,14 +305,6 @@ use vars qw(@EXPORT_OK @ISA %EXPORT_TAGS);
 
 @ISA = qw(Exporter);
 
-
-sub blessed {
-	my $item = shift;
-	local $@; # don't kill an outer $@
-	ref $item and eval { $item->can('can') };
-}
-
-
 sub run_clauses ($$$\@) {
     my($clauses,$err,$wantarray,$result) = @_;
     my $code = undef;
@@ -314,16 +323,17 @@ sub run_clauses ($$$\@) {
 		my $pkg = $catch->[$i];
 		unless(defined $pkg) {
 		    #except
-		    splice(@$catch,$i,2,$catch->[$i+1]->());
+		    splice(@$catch,$i,2,$catch->[$i+1]->($err));
 		    $i -= 2;
 		    next CATCHLOOP;
 		}
-		elsif(blessed($err) && $err->isa($pkg)) {
+		elsif(Scalar::Util::blessed($err) && $err->isa($pkg)) {
 		    $code = $catch->[$i+1];
 		    while(1) {
 			my $more = 0;
-			local($Error::THROWN);
+			local($Error::THROWN, $@);
 			my $ok = eval {
+			    $@ = $err;
 			    if($wantarray) {
 				@{$result} = $code->($err,\$more);
 			    }
@@ -341,10 +351,9 @@ sub run_clauses ($$$\@) {
 			    undef $err;
 			}
 			else {
-			    $err = defined($Error::THROWN)
-				    ? $Error::THROWN : $@;
-                $err = $Error::ObjectifyCallback->({'text' =>$err})
-                    unless ref($err);
+			    $err = $@ || $Error::THROWN;
+				$err = $Error::ObjectifyCallback->({'text' =>$err})
+					unless ref($err);
 			}
 			last CATCH;
 		    };
@@ -357,7 +366,9 @@ sub run_clauses ($$$\@) {
 	if(defined($owise = $clauses->{'otherwise'})) {
 	    my $code = $clauses->{'otherwise'};
 	    my $more = 0;
+        local($Error::THROWN, $@);
 	    my $ok = eval {
+		$@ = $err;
 		if($wantarray) {
 		    @{$result} = $code->($err,\$more);
 		}
@@ -374,11 +385,10 @@ sub run_clauses ($$$\@) {
 		undef $err;
 	    }
 	    else {
-		$err = defined($Error::THROWN)
-			? $Error::THROWN : $@;
+		$err = $@ || $Error::THROWN;
 
-        $err = $Error::ObjectifyCallback->({'text' =>$err})
-            unless ref($err);
+		$err = $Error::ObjectifyCallback->({'text' =>$err})
+			unless ref($err);
 	    }
 	}
     }
@@ -398,7 +408,7 @@ sub try (&;$) {
 
     do {
 	local $Error::THROWN = undef;
-    local $@ = undef;
+	local $@ = undef;
 
 	$ok = eval {
 	    if($wantarray) {
@@ -413,21 +423,21 @@ sub try (&;$) {
 	    1;
 	};
 
-	$err = defined($Error::THROWN) ? $Error::THROWN : $@
+	$err = $@ || $Error::THROWN
 	    unless $ok;
     };
 
     shift @Error::STACK;
 
     $err = run_clauses($clauses,$err,wantarray,@result)
-	unless($ok);
+    unless($ok);
 
     $clauses->{'finally'}->()
 	if(defined($clauses->{'finally'}));
 
     if (defined($err))
     {
-        if (blessed($err) && $err->can('throw'))
+        if (Scalar::Util::blessed($err) && $err->can('throw'))
         {
             throw $err;
         }
@@ -506,12 +516,116 @@ sub otherwise (&;$) {
 }
 
 1;
+
+package Error::WarnDie;
+
+sub gen_callstack($)
+{
+    my ( $start ) = @_;
+
+    require Carp;
+    local $Carp::CarpLevel = $start;
+    my $trace = Carp::longmess("");
+    # Remove try calls from the trace
+    $trace =~ s/(\n\s+\S+__ANON__[^\n]+)?\n\s+eval[^\n]+\n\s+Error::subs::try[^\n]+(?=\n)//sog;
+    $trace =~ s/(\n\s+\S+__ANON__[^\n]+)?\n\s+eval[^\n]+\n\s+Error::subs::run_clauses[^\n]+\n\s+Error::subs::try[^\n]+(?=\n)//sog;
+    my @callstack = split( m/\n/, $trace );
+    return @callstack;
+}
+
+my $old_DIE;
+my $old_WARN;
+
+sub DEATH
+{
+    my ( $e ) = @_;
+
+    local $SIG{__DIE__} = $old_DIE if( defined $old_DIE );
+
+    die @_ if $^S;
+
+    my ( $etype, $message, $location, @callstack );
+    if ( ref($e) && $e->isa( "Error" ) ) {
+        $etype = "exception of type " . ref( $e );
+        $message = $e->text;
+        $location = $e->file . ":" . $e->line;
+        @callstack = split( m/\n/, $e->stacktrace );
+    }
+    else {
+        # Don't apply subsequent layer of message formatting
+        die $e if( $e =~ m/^\nUnhandled perl error caught at toplevel:\n\n/ );
+        $etype = "perl error";
+        my $stackdepth = 0;
+        while( caller( $stackdepth ) =~ m/^Error(?:$|::)/ ) {
+            $stackdepth++
+        }
+
+        @callstack = gen_callstack( $stackdepth + 1 );
+
+        $message = "$e";
+        chomp $message;
+
+        if ( $message =~ s/ at (.*?) line (\d+)\.$// ) {
+            $location = $1 . ":" . $2;
+        }
+        else {
+            my @caller = caller( $stackdepth );
+            $location = $caller[1] . ":" . $caller[2];
+        }
+    }
+
+    shift @callstack;
+    # Do it this way in case there are no elements; we don't print a spurious \n
+    my $callstack = join( "", map { "$_\n"} @callstack );
+
+    die "\nUnhandled $etype caught at toplevel:\n\n  $message\n\nThrown from: $location\n\nFull stack trace:\n\n$callstack\n";
+}
+
+sub TAXES
+{
+    my ( $message ) = @_;
+
+    local $SIG{__WARN__} = $old_WARN if( defined $old_WARN );
+
+    $message =~ s/ at .*? line \d+\.$//;
+    chomp $message;
+
+    my @callstack = gen_callstack( 1 );
+    my $location = shift @callstack;
+
+    # $location already starts in a leading space
+    $message .= $location;
+
+    # Do it this way in case there are no elements; we don't print a spurious \n
+    my $callstack = join( "", map { "$_\n"} @callstack );
+
+    warn "$message:\n$callstack";
+}
+
+sub import
+{
+    $old_DIE  = $SIG{__DIE__};
+    $old_WARN = $SIG{__WARN__};
+
+    $SIG{__DIE__}  = \&DEATH;
+    $SIG{__WARN__} = \&TAXES;
+}
+
+1;
+
 __END__
 
 =head1 NAME
 
 Error - Error/exception handling in an OO-ish way
 
+=head1 WARNING
+
+Using the "Error" module is B<no longer recommended> due to the black-magical
+nature of its syntactic sugar, which often tends to break. Its maintainers
+have stopped actively writing code that uses it, and discourage people
+from doing so. See the "SEE ALSO" section below for better recommendations.
+
 =head1 SYNOPSIS
 
     use Error qw(:try);
@@ -529,7 +643,7 @@ Error - Error/exception handling in an OO-ish way
     try {
 	do_some_stuff();
 	die "error!" if $condition;
-	throw Error::Simple -text => "Oops!" if $other_condition;
+	throw Error::Simple "Oops!" if $other_condition;
     }
     catch Error::IO with {
 	my $E = shift;
@@ -587,7 +701,7 @@ C<BLOCK> will be passed two arguments. The first will be the error
 being thrown. The second is a reference to a scalar variable. If this
 variable is set by the catch block then, on return from the catch
 block, try will continue processing as if the catch block was never
-found.
+found. The error will also be available in C<$@>.
 
 To propagate the error the catch block may call C<$err-E<gt>throw>
 
@@ -608,7 +722,7 @@ type.
 Catch any error by executing the code in C<BLOCK>
 
 When evaluated C<BLOCK> will be passed one argument, which will be the
-error being processed.
+error being processed. The error will also be available in C<$@>.
 
 Only one otherwise block may be specified per try block
 
@@ -625,12 +739,25 @@ Only one finally block may be specified per try block
 
 =back
 
+=head1 COMPATIBILITY
+
+L<Moose> exports a keyword called C<with> which clashes with Error's. This
+example returns a prototype mismatch error:
+
+    package MyTest;
+
+    use warnings;
+    use Moose;
+    use Error qw(:try);
+
+(Thanks to C<maik.hentsche@amd.com> for the report.).
+
 =head1 CLASS INTERFACE
 
 =head2 CONSTRUCTORS
 
 The C<Error> object is implemented as a HASH. This HASH is initialized
-with the arguments that are passed to its constructor. The elements
+with the arguments that are passed to it's constructor. The elements
 that are used by, or are retrievable by the C<Error> class are listed
 below, other classes may add to these.
 
@@ -655,6 +782,10 @@ an object blessed into that package as the C<-object> argument.
 
 =over 4
 
+=item Error->new()
+
+See the Error::Simple documentation.
+
 =item throw ( [ ARGS ] )
 
 Create a new C<Error> object and throw an error, which will be caught
@@ -730,6 +861,13 @@ The line where the constructor of this error was called from
 
 The text of the error
 
+=item $err->associate($obj)
+
+Associates an error with an object to allow error propagation. I.e:
+
+    $ber->encode(...) or
+        return Error->prior($ber)->associate($ldap);
+
 =back
 
 =head2 OVERLOAD METHODS
@@ -759,11 +897,9 @@ to the constructor.
 
 =head1 PRE-DEFINED ERROR CLASSES
 
-=over 4
-
-=item Error::Simple
+=head2 Error::Simple
 
-This class can be used to hold simple error strings and values. Its
+This class can be used to hold simple error strings and values. It's
 constructor takes two arguments. The first is a text value, the second
 is a numeric value. These values are what will be returned by the
 overload methods.
@@ -775,7 +911,6 @@ of the error object.
 This class is used internally if an eval'd block die's with an error
 that is a plain string. (Unless C<$Error::ObjectifyCallback> is modified)
 
-=back
 
 =head1 $Error::ObjectifyCallback
 
@@ -804,6 +939,76 @@ class MyError::Bar by default:
         # Error handling here.
     }
 
+=cut
+
+=head1 MESSAGE HANDLERS
+
+C<Error> also provides handlers to extend the output of the C<warn()> perl
+function, and to handle the printing of a thrown C<Error> that is not caught
+or otherwise handled. These are not installed by default, but are requested
+using the C<:warndie> tag in the C<use> line.
+
+ use Error qw( :warndie );
+
+These new error handlers are installed in C<$SIG{__WARN__}> and
+C<$SIG{__DIE__}>. If these handlers are already defined when the tag is
+imported, the old values are stored, and used during the new code. Thus, to
+arrange for custom handling of warnings and errors, you will need to perform
+something like the following:
+
+ BEGIN {
+   $SIG{__WARN__} = sub {
+     print STDERR "My special warning handler: $_[0]"
+   };
+ }
+
+ use Error qw( :warndie );
+
+Note that setting C<$SIG{__WARN__}> after the C<:warndie> tag has been
+imported will overwrite the handler that C<Error> provides. If this cannot be
+avoided, then the tag can be explicitly C<import>ed later
+
+ use Error;
+
+ $SIG{__WARN__} = ...;
+
+ import Error qw( :warndie );
+
+=head2 EXAMPLE
+
+The C<__DIE__> handler turns messages such as
+
+ Can't call method "foo" on an undefined value at examples/warndie.pl line 16.
+
+into
+
+ Unhandled perl error caught at toplevel:
+
+   Can't call method "foo" on an undefined value
+
+ Thrown from: examples/warndie.pl:16
+
+ Full stack trace:
+
+         main::inner('undef') called at examples/warndie.pl line 20
+         main::outer('undef') called at examples/warndie.pl line 23
+
+=cut
+
+=head1 SEE ALSO
+
+See L<Exception::Class> for a different module providing Object-Oriented
+exception handling, along with a convenient syntax for declaring hierarchies
+for them. It doesn't provide Error's syntactic sugar of C<try { ... }>,
+C<catch { ... }>, etc. which may be a good thing or a bad thing based
+on what you want. (Because Error's syntactic sugar tends to break.)
+
+L<Error::Exception> aims to combine L<Error> and L<Exception::Class>
+"with correct stringification".
+
+L<TryCatch> and L<Try::Tiny> are similar in concept to Error.pm only providing
+a syntax that hopefully breaks less.
+
 =head1 KNOWN BUGS
 
 None, but that does not mean there are not any.
@@ -816,12 +1021,20 @@ The code that inspired me to write this was originally written by
 Peter Seibel <peter@weblogic.com> and adapted by Jesse Glick
 <jglick@sig.bsh.com>.
 
+C<:warndie> handlers added by Paul Evans <leonerd@leonerd.org.uk>
+
 =head1 MAINTAINER
 
-Shlomi Fish <shlomif@iglu.org.il>
+Shlomi Fish, L<http://www.shlomifish.org/> .
 
 =head1 PAST MAINTAINERS
 
 Arun Kumar U <u_arunkumar@yahoo.com>
 
+=head1 COPYRIGHT
+
+Copyright (c) 1997-8  Graham Barr. All rights reserved.
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
 =cut
diff --git a/perl/Git/FromCPAN/Mail/Address.pm b/perl/FromCPAN/Mail/Address.pm
index 13b2ff7..683d490 100644
--- a/perl/Git/FromCPAN/Mail/Address.pm
+++ b/perl/FromCPAN/Mail/Address.pm
@@ -1,10 +1,14 @@
-# Copyrights 1995-2017 by [Mark Overmeer <perl@overmeer.net>].
+# Copyrights 1995-2018 by [Mark Overmeer].
 #  For other contributors see ChangeLog.
 # See the manual pages for details on the licensing terms.
 # Pod stripped from pm file by OODoc 2.02.
+# This code is part of the bundle MailTools.  Meta-POD processed with
+# OODoc into POD and HTML manual-pages.  See README.md for Copyright.
+# Licensed under the same terms as Perl itself.
+
 package Mail::Address;
 use vars '$VERSION';
-$VERSION = '2.19';
+$VERSION = '2.20';
 
 use strict;
 
diff --git a/perl/Git.pm b/perl/Git.pm
index 9d60d79..16ebcc6 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -9,7 +9,10 @@ package Git;
 
 use 5.008;
 use strict;
+use warnings;
 
+use File::Temp ();
+use File::Spec ();
 
 BEGIN {
 
@@ -101,7 +104,7 @@ increase notwithstanding).
 
 
 use Carp qw(carp croak); # but croak is bad - throw instead
-use Git::Error qw(:try);
+use Git::LoadCPAN::Error qw(:try);
 use Cwd qw(abs_path cwd);
 use IPC::Open2 qw(open2);
 use Fcntl qw(SEEK_SET SEEK_CUR);
@@ -189,7 +192,6 @@ sub repository {
 		};
 
 		if ($dir) {
-			_verify_require();
 			File::Spec->file_name_is_absolute($dir) or $dir = $opts{Directory} . '/' . $dir;
 			$opts{Repository} = abs_path($dir);
 
@@ -534,7 +536,9 @@ If TIME is not supplied, the current local time is used.
 sub get_tz_offset {
 	# some systems don't handle or mishandle %z, so be creative.
 	my $t = shift || time;
-	my $gm = timegm(localtime($t));
+	my @t = localtime($t);
+	$t[5] += 1900;
+	my $gm = timegm(@t);
 	my $sign = qw( + + - )[ $gm <=> $t ];
 	return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
 }
@@ -1288,8 +1292,6 @@ sub temp_release {
 sub _temp_cache {
 	my ($self, $name) = _maybe_self(@_);
 
-	_verify_require();
-
 	my $temp_fd = \$TEMP_FILEMAP{$name};
 	if (defined $$temp_fd and $$temp_fd->opened) {
 		if ($TEMP_FILES{$$temp_fd}{locked}) {
@@ -1323,11 +1325,6 @@ sub _temp_cache {
 	$$temp_fd;
 }
 
-sub _verify_require {
-	eval { require File::Temp; require File::Spec; };
-	$@ and throw Error::Simple($@);
-}
-
 =item temp_reset ( FILEHANDLE )
 
 Truncates and resets the position of the C<FILEHANDLE>.
@@ -1692,7 +1689,6 @@ sub DESTROY {
 # Pipe implementation for ActiveState Perl.
 
 package Git::activestate_pipe;
-use strict;
 
 sub TIEHANDLE {
 	my ($class, @params) = @_;
diff --git a/perl/Git/Error.pm b/perl/Git/Error.pm
deleted file mode 100644
index 09bbc97..0000000
--- a/perl/Git/Error.pm
+++ /dev/null
@@ -1,46 +0,0 @@
-package Git::Error;
-use 5.008;
-use strict;
-use warnings;
-
-=head1 NAME
-
-Git::Error - Wrapper for the L<Error> module, in case it's not installed
-
-=head1 DESCRIPTION
-
-Wraps the import function for the L<Error> module.
-
-This module is only intended to be used for code shipping in the
-C<git.git> repository. Use it for anything else at your peril!
-
-=cut
-
-sub import {
-    shift;
-    my $caller = caller;
-
-    eval {
-	require Error;
-	1;
-    } or do {
-	my $error = $@ || "Zombie Error";
-
-	my $Git_Error_pm_path = $INC{"Git/Error.pm"} || die "BUG: Should have our own path from %INC!";
-
-	require File::Basename;
-	my $Git_Error_pm_root = File::Basename::dirname($Git_Error_pm_path) || die "BUG: Can't figure out lib/Git dirname from '$Git_Error_pm_path'!";
-
-	require File::Spec;
-	my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_Error_pm_root, 'FromCPAN');
-	die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root;
-
-	local @INC = ($Git_pm_FromCPAN_root, @INC);
-	require Error;
-    };
-
-    unshift @_, $caller;
-    goto &Error::import;
-}
-
-1;
diff --git a/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm
new file mode 100644
index 0000000..e5585e7
--- /dev/null
+++ b/perl/Git/LoadCPAN.pm
@@ -0,0 +1,104 @@
+package Git::LoadCPAN;
+use 5.008;
+use strict;
+use warnings;
+
+=head1 NAME
+
+Git::LoadCPAN - Wrapper for loading modules from the CPAN (OS) or Git's own copy
+
+=head1 DESCRIPTION
+
+The Perl code in Git depends on some modules from the CPAN, but we
+don't want to make those a hard requirement for anyone building from
+source.
+
+Therefore the L<Git::LoadCPAN> namespace shipped with Git contains
+wrapper modules like C<Git::LoadCPAN::Module::Name> that will first
+attempt to load C<Module::Name> from the OS, and if that doesn't work
+will fall back on C<FromCPAN::Module::Name> shipped with Git itself.
+
+Usually distributors will not ship with Git's Git::FromCPAN tree at
+all via the C<NO_PERL_CPAN_FALLBACKS> option, preferring to use their
+own packaging of CPAN modules instead.
+
+This module is only intended to be used for code shipping in the
+C<git.git> repository. Use it for anything else at your peril!
+
+=cut
+
+# NO_PERL_CPAN_FALLBACKS_STR evades the sed search-replace from the
+# Makefile, and allows for detecting whether the module is loaded from
+# perl/Git as opposed to perl/build/Git, which is useful for one-off
+# testing without having Error.pm et al installed.
+use constant NO_PERL_CPAN_FALLBACKS_STR => '@@' . 'NO_PERL_CPAN_FALLBACKS' . '@@';
+use constant NO_PERL_CPAN_FALLBACKS => (
+	q[@@NO_PERL_CPAN_FALLBACKS@@] ne ''
+	and
+	q[@@NO_PERL_CPAN_FALLBACKS@@] ne NO_PERL_CPAN_FALLBACKS_STR
+);
+
+sub import {
+	shift;
+	my $caller = caller;
+	my %args = @_;
+	my $module = exists $args{module} ? delete $args{module} : die "BUG: Expected 'module' parameter!";
+	my $import = exists $args{import} ? delete $args{import} : die "BUG: Expected 'import' parameter!";
+	die "BUG: Too many arguments!" if keys %args;
+
+	# Foo::Bar to Foo/Bar.pm
+	my $package_pm = $module;
+	$package_pm =~ s[::][/]g;
+	$package_pm .= '.pm';
+
+	eval {
+		require $package_pm;
+		1;
+	} or do {
+		my $error = $@ || "Zombie Error";
+
+		if (NO_PERL_CPAN_FALLBACKS) {
+			chomp(my $error = sprintf <<'THEY_PROMISED', $module);
+BUG: The '%s' module is not here, but NO_PERL_CPAN_FALLBACKS was set!
+
+Git needs this Perl module from the CPAN, and will by default ship
+with a copy of it. This Git was built with NO_PERL_CPAN_FALLBACKS,
+meaning that whoever built it promised to provide this module.
+
+You're seeing this error because they broke that promise, and we can't
+load our fallback version, since we were asked not to install it.
+
+If you're seeing this error and didn't package Git yourself the
+package you're using is broken, or your system is broken. This error
+won't appear if Git is built without NO_PERL_CPAN_FALLBACKS (instead
+we'll use our fallback version of the module).
+THEY_PROMISED
+			die $error;
+		}
+
+		my $Git_LoadCPAN_pm_path = $INC{"Git/LoadCPAN.pm"} || die "BUG: Should have our own path from %INC!";
+
+		require File::Basename;
+		my $Git_LoadCPAN_pm_root = File::Basename::dirname($Git_LoadCPAN_pm_path) || die "BUG: Can't figure out lib/Git dirname from '$Git_LoadCPAN_pm_path'!";
+
+		require File::Spec;
+		my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_LoadCPAN_pm_root, '..', 'FromCPAN');
+		die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root;
+
+		local @INC = ($Git_pm_FromCPAN_root, @INC);
+		require $package_pm;
+	};
+
+	if ($import) {
+		no strict 'refs';
+		*{"${caller}::import"} = sub {
+			shift;
+			use strict 'refs';
+			unshift @_, $module;
+			goto &{"${module}::import"};
+		};
+		use strict 'refs';
+	}
+}
+
+1;
diff --git a/perl/Git/LoadCPAN/Error.pm b/perl/Git/LoadCPAN/Error.pm
new file mode 100644
index 0000000..c6d2c45
--- /dev/null
+++ b/perl/Git/LoadCPAN/Error.pm
@@ -0,0 +1,10 @@
+package Git::LoadCPAN::Error;
+use 5.008;
+use strict;
+use warnings;
+use Git::LoadCPAN (
+	module => 'Error',
+	import => 1,
+);
+
+1;
diff --git a/perl/Git/LoadCPAN/Mail/Address.pm b/perl/Git/LoadCPAN/Mail/Address.pm
new file mode 100644
index 0000000..f70a4f0
--- /dev/null
+++ b/perl/Git/LoadCPAN/Mail/Address.pm
@@ -0,0 +1,10 @@
+package Git::LoadCPAN::Mail::Address;
+use 5.008;
+use strict;
+use warnings;
+use Git::LoadCPAN (
+	module => 'Mail::Address',
+	import => 0,
+);
+
+1;
diff --git a/perl/Git/Mail/Address.pm b/perl/Git/Mail/Address.pm
deleted file mode 100755
index 2ce3e84..0000000
--- a/perl/Git/Mail/Address.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-package Git::Mail::Address;
-use 5.008;
-use strict;
-use warnings;
-
-=head1 NAME
-
-Git::Mail::Address - Wrapper for the L<Mail::Address> module, in case it's not installed
-
-=head1 DESCRIPTION
-
-This module is only intended to be used for code shipping in the
-C<git.git> repository. Use it for anything else at your peril!
-
-=cut
-
-eval {
-    require Mail::Address;
-    1;
-} or do {
-    require Git::FromCPAN::Mail::Address;
-};
-
-1;
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index bc4eed3..991a588 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1405,7 +1405,7 @@ sub parse_svn_date {
 		$ENV{TZ} = 'UTC';
 
 		my $epoch_in_UTC =
-		    Time::Local::timelocal($S, $M, $H, $d, $m - 1, $Y - 1900);
+		    Time::Local::timelocal($S, $M, $H, $d, $m - 1, $Y);
 
 		# Determine our local timezone (including DST) at the
 		# time of $epoch_in_UTC.  $Git::SVN::Log::TZ stored the
diff --git a/po/bg.po b/po/bg.po
index a37d5df..48fe315 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -70,6 +70,8 @@
 # linked checkout �вързано изтегл�не
 # term управл�ваща дума (за git-bisect)
 # mergetag етикет при �ливане
+# packfile пакет
+# promisory гаратиращ, гарант promisory packfile гарантиращ пакет, promisory remote хранилище-гарант
 # delta - разлика, делта, обект-разлика
 # peeled tag - про�леден етикет - когато етикет �очи към друг етикет, а не подаване и про�лед�ваме подобно на �имволна връзка
 # strip - премахвам (за компонент при филтриране)
@@ -88,6 +90,7 @@
 # ignored (file) игнориран, пон�кога - пропу�нат
 # manual, man page ръковод�тво
 # guide въведение
+# partial clone непълно хранилище
 # ------------------------
 # „$var“ - може да не �работва за shell има gettext и eval_gettext - проверка - намират �е ле�но по „$
 # ------------------------
@@ -100,8 +103,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git master\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-11 22:01+0100\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-16 09:53+0100\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -152,7 +155,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Изход от програмата заради некоригиран конфликт."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува)."
 
@@ -573,7 +576,7 @@ msgstr "�м�на на режима на до�тъпа на „%s“, койт
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци�та за �умата по SHA1 лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "неу�пешно �ъздаване на запи� в кеша чрез „make_cache_entry“ за „%s“"
@@ -651,7 +654,7 @@ msgstr[1] "Прилагане на кръпката „%%s“ � %d отхвър
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "�ъкращаване на името на файла � отхвърлените парчета на „ %.*s.rej“"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "„%s“ не може да бъде отворен"
@@ -711,11 +714,11 @@ msgstr[1] ""
 msgid "Unable to write new index file"
 msgstr "�ови�т индек� не може да бъде запи�ан"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "път"
@@ -728,7 +731,7 @@ msgstr "без прилагане на промените напаÑ�ващи нÐ
 msgid "apply changes matching the given path"
 msgstr "прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "БРОЙ"
 
@@ -768,79 +771,79 @@ msgstr "прилагане на кръпката без пром�на на ра
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, ко�то промен� и файлове извън работното дърво"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена.  Опци�та �е комбинира � „--check“/„--stat“/„--"
 "summary“"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "пробване � тройно �ливане, ако кръпката не може да �е приложи директно"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "�ъздаване на временен индек� на база на включената информаци� за индек�а"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "да �е о�игури контек�т от поне такъв БРОЙ �ъвпадащи редове"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "дей�твие"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "за�ичане на нови или променени редове � грешки в знаците за интервали"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "игнориране на промените в знаците за интервали при откриване на контек�та"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна по�ока"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "без изи�кване на дори и един ред контек�т"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тав�не на отхвърлените парчета във файлове � разширение „.rej“"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "позвол�ване на за�тъпващи �е парчета"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "повече подробно�ти"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно лип�ващ знак за нов ред в кра� на файл"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без довер�ване на номерата на редовете в заглавните ча�ти на парчетата"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "��Ч�Л��_ДИРЕКТОРИЯ"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "добав�не на тази ��Ч�Л��_ДИРЕКТОРИЯ към имената на в�ички файлове"
 
@@ -876,7 +879,7 @@ msgstr "ФОРМ�Т"
 msgid "archive format"
 msgstr "ФОРМ�Т на архива"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "ПРЕФИКС"
 
@@ -884,11 +887,11 @@ msgstr "ПРЕФИКС"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добав�не на този ПРЕФИКС към в�еки път в архива"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "Ф�ЙЛ"
 
@@ -920,8 +923,8 @@ msgstr "добро компре�иране"
 msgid "list supported archive formats"
 msgstr "извеждане на �пи�ъка � поддържаните формати"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "хранилище"
 
@@ -972,22 +975,22 @@ msgstr ""
 "Отрицателните шаблони �е игнорират в атрибутите на git.\n"
 "�ко ви тр�бва начална удивителна, ползвайте „\\!“."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "�еправилно цитирано �ъдържание във файла „%s“: %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Повече не може да �е тър�и двоично!\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�еправилно име на подаване „%s“"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -996,7 +999,7 @@ msgstr ""
 "�еправилна база за �ливане: %s.\n"
 "Следователно грешката е коригирана между „%s“ и [%s].\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1005,7 +1008,7 @@ msgstr ""
 "�ова база за �ливане: %s.\n"
 "Свой�твото е променено между „%s“ и [%s].\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1014,7 +1017,7 @@ msgstr ""
 "Базата за �ливане „%s“ е %s.\n"
 "Следователно първото %s подаване е между „%s“ и [%s].\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1025,7 +1028,7 @@ msgstr ""
 "Двоичното тър�ене � git bisect н�ма да работи правилно.\n"
 "Дали не �те объркали указателите „%s“ и „%s“?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1041,31 +1044,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Двоично тър�ене: тр�бва да �е провери база за �ливане\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "необходима е вер�и� „%s“"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "неу�пешно прочитане на указателите за двоично тър�ене"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "„%s“ e както „%s“, така и „%s“\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1074,7 +1077,7 @@ msgstr ""
 "Лип�ва подход�що за те�тване подаване.\n"
 "Проверете параметрите за пътищата.\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1084,47 +1087,47 @@ msgstr[1] "(приблизително %d �тъпки)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Двоично тър�ене: о�тава %d вер�и� �лед тази %s\n"
 msgstr[1] "Двоично тър�ене: о�тават %d вер�ии �лед тази %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "Опциите „--contents“ и „--reverse“ �а не�ъвме�тими"
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "Опци�та „--contents“ е не�ъвме�тима � име на обект от крайно подаване"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на крайно подаване"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "неу�пешно на�тройване на обхождането на вер�иите"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на диапазон по веригата на първите на�ледници"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "н�ма път на име „%s“ в „%s“"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "обектът BLOB „%s“ в път� %s не може да бъде прочетен"
@@ -1277,77 +1280,76 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi
 msgid "unrecognized header: %s%s (%d)"
 msgstr "непозната заглавна ча�т: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "„%s“ не може да �е отвори"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В хранилището лип�ват �ледните необходими подавани�:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Пратката �ъдържа �ледни� указател:"
 msgstr[1] "Пратката �ъдържа �ледните %d указатели:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "Пратката �ъдържа пълна и�тори�."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Пратката изи�ква �ледни� указател:"
 msgstr[1] "Пратката изи�ква �ледните %d указатели:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "Командата „git pack-objects“ не може да бъде �тартирана"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "Командата „git pack-objects“ не завърши у�пешно"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "Командата „git rev-list“ не завърши у�пешно"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 "указател�т „%s“ не е бил включен поради опциите зададени на „git rev-list“"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "непознат аргумент: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "Създаването на празна пратка е невъзможно."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "Файлът „%s“ не може да бъде �ъздаден"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "Командата „git index-pack“ не завърши у�пешно"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "неправилна �тойно�т за цв�т: %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "„%s“ не може да �е анализира"
@@ -1357,7 +1359,7 @@ msgstr "„%s“ не може да �е анализира"
 msgid "%s %s is not a commit!"
 msgstr "%s %s не е подаване!"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1463,69 +1465,69 @@ msgstr "„%s“ не е правилна �тойно�т за време за
 msgid "bad zlib compression level %d"
 msgstr "неправилно ниво на компре�иране: %d"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "неправилен режим за �ъздаването на обекти: %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправилно ниво на компре�иране при пакетиране: %d"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "неправилни на�тройки от командни� ред"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�еправилен %s: „%s“"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "непозната �тойно�т „%s“ за на�тройката „core.untrackedCache“.  Ще �е ползва "
 "�тандартната �тойно�т „keep“ (запазване)"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "�тойно�тта на „splitIndex.maxPercentChange“ тр�бва да е между 1 и 100, а не "
 "%d"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "неразпозната �тойно�т „%s“ от командни� ред"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправилна на�тройка „%s“ във файла „%s“ на ред №%d"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "зададени �а н�колко �тойно�ти за „%s“"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "неу�пешно изпълнение на „fstat“ върху „%s“"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "„%s“ не може да �е зададе да е „%s“"
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "„%s“ не може да �е премахне"
@@ -1546,24 +1548,29 @@ msgstr ""
 "Проверете дали то �ъще�твува и дали имате права\n"
 "за до�тъп."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "Проверка на връзката"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "Командата „git rev-list“ не може да бъде изпълнена."
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "неу�пешен запи� на �пи�ъка � вер�иите"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "�тандартни�т вход на �пи�ъка � вер�иите не може да бъде затворен"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "В��ка по�ледователно�т от знаци „CRLF“ ще бъдe заменена � „LF“ в „%s“."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1572,12 +1579,13 @@ msgstr ""
 "Файлът ще о�тане � първоначалните знаци за край на ред в работната ви "
 "директори�."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "В��ка по�ледователно�т от знаци „CRLF“ ще бъдe заменена � „LF“ в „%s“."
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+"В�еки знак „LF“ ще бъдe заменен � по�ледователно�тта от знаци „CRLF“ в „%s“."
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1588,12 +1596,6 @@ msgstr ""
 "Файлът ще о�тане � първоначалните знаци за край на ред в работната ви "
 "директори�."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-"В�еки знак „LF“ ще бъдe заменен � по�ледователно�тта от знаци „CRLF“ в „%s“."
-
 #: date.c:116
 msgid "in the future"
 msgstr "в бъдещето"
@@ -1694,7 +1696,7 @@ msgid ""
 "'plain'"
 msgstr ""
 "на�тройката за цв�т за преме�тване тр�бва да е една от: „no“ (без), "
-"„default“ (�тандартно), „zebra“ (райе), „dimmed_zebra“ (притъмнено райе), "
+"„default“ (�тандартно), „zebra“ (райе), „dimmed_zebra“ (тъмно райе), "
 "„plain“ (обикновено)"
 
 #: diff.c:341
@@ -1711,23 +1713,27 @@ msgstr ""
 "Грешки в на�тройката „diff.dirstat“:\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "външната програма за разлики завърши неу�пешно.  Спиране на работата при „%s“"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ �а не�ъвме�тими "
 "една � друга"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "Опциите „-G“, „-S“ и „--find-object“ �а не�ъвме�тими една � друга"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "Опци�та „--follow“ изи�ква точно един път"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1736,43 +1742,48 @@ msgstr ""
 "�еразпознат параметър към опци�та „--dirstat/-X“:\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "�еразпознат параметър към опци�та „--submodule“: „%s“"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "тър�енето на преименувани� на обекти �ъчетани � промени �е пре�кача поради "
 "многото файлове."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "у�тановени �а точните копи� на променените пътища поради многото файлове."
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "директори�та „%s“ не може да бъде отворена"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "името и вер�и�та на �дрото не б�ха получени"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 "Кеша за не�ледените файлове е изключен на тази �и�тема или ме�тоположение."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "директори�та на git не може да �е мигрира от „%s“ до „%s“"
@@ -1791,184 +1802,193 @@ msgstr "Филтриране на �ъдържанието"
 msgid "could not stat file '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху файла „%s“"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Лип�ва адре� за отдалеченото хранилище"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: очаква �е плитък �пи�ък"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: очакваше �е „ACK“/„NAK“, а бе получен „EOF“"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr ""
+"git fetch-pack: очакваше �е „ACK“/„NAK“, а бе получен изчи�тващ пакет „flush“"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "отдалечена грешка: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: очакваше �е „ACK“/„NAK“, а бе получен „%s“"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "опци�та „--stateless-rpc“ изи�ква  „multi_ack_detailed“"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправилен плитък ред: „%s“"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправилен неплитък ред: „%s“"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "обектът „%s“ лип�ва"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "грешка в обекта: „%s“"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "не е открит плитък обект: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "очаква �е плитък или не обект, а бе получено: %s"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено бе %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "неправилно подаване: „%s“"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "преу�танов�ване"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "дей�твието завърши"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено бе %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Отбел�зване на „%s“ като пълно"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "вече има „%s“ (%s)"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за демултиплек�ора"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "протоколна грешка: неправилна заглавна ча�т на пакет"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за „%s“"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "грешка в демултиплек�ора"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "Сървърът не поддържа плитки клиенти"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "Сървърът поддържа „multi_ack_detailed“"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "Сървърът поддържа „no-done“"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "Сървърът поддържа „multi_ack“"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "Сървърът поддържа „side-band-64k“"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "Сървърът поддържа „side-band“"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Сървърът поддържа „allow-tip-sha1-in-want“"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "Сървърът поддържа „ofs-delta“"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Сървърът поддържа филтри"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и�та на �ървъра е: %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "Сървърът не поддържа опци�та „--shallow-since“"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "Сървърът не поддържа опци�та „--shallow-exclude“"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "Сървърът не поддържа опци�та „--deepen“"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "н�ма общи подавани�"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: неу�пешно до�тав�не."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "не може да бъде открит подход�щ връх от отдалеченото хранилище"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "такъв отдалечен указател н�ма: %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сървърът не позвол�ва за�вка за необ�вен „%s“"
@@ -1991,17 +2011,18 @@ msgstr "Програмата не уÑ�пÑ� да запише Ñ�амоÑ�тоÑ�Ñ‚Ð
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "пре�качане на неправилни� цв�т „%.*s“ в „log.graphColors“"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s“: файлът �очен от „%s“ не може да бъде прочетен"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
@@ -2151,19 +2172,18 @@ msgstr "не може да �е ползва празно име като иде
 msgid "name consists only of disallowed characters: %s"
 msgstr "името �ъдържа �амо непозволени знаци: „%s“"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправилен формат на дата: %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "не може да комбинирате филтри по различен вид обекти"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "не може да комбинирате множе�тво филтри"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "указан е неправилен израз за филтър: „%s“"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "не може да промените хранилището-гарант на непълно хранилище"
 
 #: lockfile.c:151
 #, c-format
@@ -2193,8 +2213,8 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде
 msgid "failed to read the cache"
 msgstr "кешът не може да бъде прочетен"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "неу�пешно запи�ване на нови� индек�"
 
@@ -2211,62 +2231,62 @@ msgstr "неу�пешно изпълнение на „addinfo_cache“ за п
 msgid "error building trees"
 msgstr "грешка при изграждане на дърветата"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "грешка при �ъздаването на път� „%s“%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Изтриване на „%s“, за да �е о�вободи м��то за поддиректори�\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": възможно е да има конфликт директори�/файл."
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 "преу�танов�ване на дей�твието, за да не �е изтрие не�ледени�т файл „%s“"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "обектът „%s“ (%s) не може да бъде прочетен"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "обектът „%s“ (%s) �е очакваше да е BLOB, а не е"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "неу�пешно �ъздаване на �имволната връзка „%s“: %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 "не е ��но какво да �е прави � обекта „%2$s“ (%3$s) � права за до�тъп „%1$06o“"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "�еу�пешно вътрешно �ливане"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "„%s“ не може да �е добави в базата � данни"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2275,7 +2295,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2284,7 +2304,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2293,7 +2313,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2302,20 +2322,20 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "преименуване"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "преименуван"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "„%s“ е директори� в „%s“, затова �е добав� като „%s“"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2324,145 +2344,145 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (некоригиран конфликт)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
 "„%s“ е добавен в „%s“"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "Добав�не на �лети� „%s“"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добав�не като „%s“"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "обектът „%s“ не може да �е прочете"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "обектът „%s“ не е BLOB"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "пром�на"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "променен"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "�ъдържание"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "добав�не/добав�не"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пре�качане на „%s“ (�лети�т резултат е идентичен �ъ� �егашни�)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�втоматично �ливане на „%s“"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "ПОДМОДУЛ"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "Изтриване на „%s“"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "файл/директори�"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "директори�/файл"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "КО�ФЛИКТ (%s): Съще�твува директори� на име „%s“ в „%s“.  Добав�не на „%s“ "
 "като „%s“"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "Добав�не на „%s“"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr ""
 "Индек�ът не е чи�т: кръпките не могат да бъдат приложени (замър�ени �а: %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "Вече е обновено!"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "неу�пешно �ливане на дърветата „%s“ и „%s“"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "Сливане:"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "открит е %u общ предше�твеник:"
 msgstr[1] "открити �а %u общи предше�твеници:"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "�ливането не върна подаване"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�еу�пешен анализ на обекта „%s“"
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "Индек�ът не може да бъде прочетен"
 
@@ -2489,17 +2509,17 @@ msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 "�е �те завършили �ливането на бележките.  (Указател�т „%s“ �ъще�твува)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "�еинициализирано или нереферирано дърво за бележки не може да бъде подадено"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "�еправилна �тойно�т за „notes.rewriteMode“: „%s“"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
@@ -2509,7 +2529,7 @@ msgstr ""
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Зададена е лоша �тойно�т на променливата „%s“: „%s“"
@@ -2519,30 +2539,30 @@ msgstr "Зададена е лоша Ñ�тойноÑ�Ñ‚ на променливаÑ
 msgid "unable to parse object: %s"
 msgstr "обектът „%s“ не може да бъде анализиран"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 "отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
 "индек�ът да е повреден)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "отме�тване преди кра� на индек�а на пакетни� файл „%s“ (възможно е индек�ът "
 "да е отр�зан)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "употреба: %s"
@@ -2550,17 +2570,17 @@ msgstr "употреба: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "     или: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-ЧИСЛО"
 
@@ -2652,7 +2672,7 @@ msgstr "път�т „%s“ е �лед �имволна връзка"
 msgid "unable to parse --pretty format"
 msgstr "аргументът към опци�та „--pretty“ не може да �е анализира"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2661,7 +2681,7 @@ msgstr ""
 "Зададена е неправилна �тойно�т на на�тройката „index.version“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2671,22 +2691,22 @@ msgstr ""
 "„GIT_INDEX_VERSION“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "„%s“ не може да �е затвори"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху „%s“"
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не може да �е отвори директори�та на git: %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
@@ -2705,18 +2725,18 @@ msgstr "обнов�вани�та на указатели �а забранен
 msgid "could not remove reference %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит: %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Указателите не може да бъдат изтрити: %s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "изтрит"
 
@@ -2910,130 +2930,140 @@ msgstr "УказателÑ�Ñ‚ „HEAD“ не е Ñ�вързан и е отделÐ
 msgid "(no branch)"
 msgstr "(извън клон)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "обектът „%s“ лип�ва за „%s“"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "неу�пешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "обект �ъ� �грешен формат при „%s“"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнориране на указател� � грешно име „%s“"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "игнориране на повредени� указател „%s“"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправилно име на обект „%s“"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�евъзможно е да �е до�тав�т едновременно и „%s“, и „%s“ към „%s“"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "„%s“ обикновено �леди „%s“, а не „%s“"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "„%s“ �леди както „%s“, така и „%s“"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "Указател�т „HEAD“ не �очи към клон"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "н�ма клон на име „%s“"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "не е зададен клон-източник за клона „%s“"
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "клонът-източник „%s“ не е �ъхранен като �лед�щ клон"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "лип�ва локален �лед�щ клон за ме�тоположението за изтла�кване „%s“ в "
 "хранилището „%s“"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "н�ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "указател�т за изтла�кване на „%s“ не включва „%s“"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "указател�т за изтла�кване не включва цел („push.default“ е „nothing“)"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "про�тото (simple) изтла�кване не �ъответ�тва на една цел"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Този клон �леди „%s“, но �ледени�т клон е изтрит.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Клонът е актуализиран към „%s“.\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Клонът ви и „%s“ �очат към различни подавани�.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (за повече информаци� ползвайте „%s“)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Клонът ви е � %2$d подаване пред „%1$s“.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� пред „%1$s“.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (публикувайте локалните �и промени чрез „git push“)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -3041,11 +3071,11 @@ msgid_plural ""
 msgstr[0] "Клонът ви е � %2$d подаване зад „%1$s“ и може да бъде превърт�н.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� зад „%1$s“ и може да бъде превърт�н.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (обновете локални� �и клон чрез „git pull“)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -3060,28 +3090,28 @@ msgstr[1] ""
 "Текущи�т клон �е е отделил от „%s“,\n"
 "двата имат �ъответно по %d и %d не�ъвпадащи подавани�.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (�лейте отдалечени� клон в локални� чрез „git pull“)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "Текущи�т клон е повреден"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Текущи�т клон „%s“ е без подавани� "
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "опциите „--first-parent“ и „--bisect“ �а не�ъвме�тими"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "неу�пешно отвар�не на „/dev/null“"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -3092,25 +3122,31 @@ msgstr ""
 "    git config advice.ignoredHook false"
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"неочакван изчи�тващ пакет „flush“ при изчитане на �ъ�то�нието от "
+"отдалеченото разпакетиране"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 "�ъ�то�нието от отдалеченото разпакетиране не може да бъде анализирано: %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "неу�пешно отдалечено разпакетиране: %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "�ертификатът за изтла�кване не може да бъде подпи�ан"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "от�рещната �трана не поддържа изтла�кване � опци�та „--signed“"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -3118,32 +3154,37 @@ msgstr ""
 "от�рещната �трана не поддържа изтла�кване � опци�та „--signed“, затова не �е "
 "използва �ертификат"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "получаващата �трана не поддържа изтла�кване � опци�та „--atomic“"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "от�рещната �трана не поддържа опции при изтла�кване"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "не�ъще�твуващ режим на изчи�тване „%s“ на �ъобщение при подаване"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "отм�на"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "отбиране"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "�еизве�тно дей�твие: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3151,7 +3192,7 @@ msgstr ""
 "�лед коригирането на конфликтите, отбележете �ъответните\n"
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“."
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3161,43 +3202,43 @@ msgstr ""
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“, �лед което\n"
 "подайте резултата � командата „git commit'“."
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "„%s“ не може да �е заключи"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "в „%s“ не може да �е пише"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "кра�т на ред не може да �е запише в „%s“"
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "„%s“ не може да �е завърши."
+msgid "failed to finalize '%s'"
+msgstr "„%s“ не може да �е завърши"
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "локалните ви промени ще бъдат презапи�ани при %s."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "подайте или �катайте промените, за да продължите"
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: превъртане"
@@ -3205,20 +3246,20 @@ msgstr "%s: превъртане"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "подаването, �очено от указател� „HEAD“, не може да бъде открито"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "дървото на кеша не може да бъде обновено"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3247,17 +3288,131 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+"неу�пешно изпълнение на куката при пром�на на �ъобщението при подаване "
+"(prepare-commit-msg)"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Името и адре�ът за е-поща �а на�троени автоматично на базата на името на\n"
+"потребител� и името на машината.  Проверете дали �а верни.  Можете да "
+"�прете\n"
+"това �ъобщение като изрично зададете �тойно�тите.  Изпълнете �ледната "
+"команда\n"
+"и �ледвайте ин�трукциите в тек�тови� ви редактор, за да редактирате\n"
+"конфигурационни� файл:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"След като направите това, можете да коригирате информаци�та за автора на\n"
+"текущото подаване чрез:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Името и адре�ът за е-поща �а на�троени автоматично на базата на името на\n"
+"потребител� и името на машината.  Проверете дали �а верни.  Можете да "
+"�прете\n"
+"това �ъобщение като изрично зададете �тойно�тите:\n"
+"\n"
+"    git config --global user.name \"Вашето Име\"\n"
+"    git config --global user.email пенчо@example.com\n"
+"\n"
+"След като направите това, можете да коригирате информаци�та за автора на\n"
+"текущото подаване чрез:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "току що �ъздаденото подаване не може да бъде открито"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "току що �ъздаденото подаване не може да бъде анализирано"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+"�ъ�то�нието �очено от указател� „HEAD“ не може да бъде открито �лед "
+"подаването"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "не�вързан връх „HEAD“"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (начално подаване)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "указател�т „HEAD“ не може да бъде анализиран"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "указател�т „HEAD“ „%s“ �очи към нещо, което не е подаване!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "авторът на подаването не може да бъде анализиран"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "Командата „git write-tree“ не у�п� да запише обект-дърво"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "�ъобщението за подаване не може да бъде прочетено от „%s“"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "обектът за подаването не може да бъде запи�ан"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "родител�кото подаване „%s“ не може да бъде анализирано"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3268,7 +3423,7 @@ msgstr ""
 "\n"
 "    %.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3279,250 +3434,254 @@ msgstr ""
 "\n"
 "    %.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Това е обединение от %d подавани�"
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "За �мачкване ви тр�бва указател „HEAD“"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "указател�т „HEAD“ не може да �е прочете"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr ""
 "�ъобщението за подаване към указател� „HEAD“ не може да бъде прочетено: %s"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "„%s“ не може да �е запази"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "Това е 1-то �ъобщение при подаване:"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде прочетено"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Това е �ъобщение при подаване №%d:"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Съобщение при подаване №%d ще бъде пре�кочено:"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "непозната команда: %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "индек�ът не е �л�т."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "подаването „%s“ е �ливане, но не е дадена опци�та „-m“"
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "подаването „%s“ н�ма родител %d"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "указано е базово подаване, но подаването „%s“ не е �ливане."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "неу�пешно извличане на �ъобщението за подаване на „%s“"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: неразпозната �тойно�т за родител�кото подаване „%s“"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "„%s“ не може да �е преименува на „%s“"
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "подаването „%s“… не може да бъде отменено: „%s“"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "подаването „%s“… не може да бъде приложено: „%s“"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "зададено е празно множе�тво от подавани�"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: неу�пешно изчитане на индек�а"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: неу�пешно обнов�ване на индек�а"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "„%s“ не приема аргументи: „%s“"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "„%s“ изи�ква аргументи"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправилен ред %d: %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „%s“"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "от „%s“ не може да �е чете."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "коригирайте това чрез „git rebase --edit-todo“."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "неизползваем файл � опи�ание на пред�то�щите дей�тви�: „%s“"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "никое от подавани�та не може да �е разпознае."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 "по време на отм�на на подаване не може да �е извърши отбиране на подаване."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши отм�на на подаване."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "неправилен ключ: „%s“"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "неправилен файл � опции: „%s“"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 "в момента вече �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "директори�та за �еквен�ора „%s“ не може да бъде �ъздадена"
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "указател�т „HEAD“ не може да �е заключи"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "в момента не �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "дей�твието не може да бъде преу�тановено, когато �те на клон, който тепърва "
 "пред�тои да бъде �ъздаден"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "„%s“ не може да бъде отворен"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "„%s“ не може да бъде прочетен: %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "неочакван край на файл"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "запазени�т преди започването на отбирането файл за указател� „HEAD“ — „%s“ е "
 "повреден"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Изглежда указател�т „HEAD“ е променен.  Проверете към какво �очи.\n"
 "�е �е прав�т промени."
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "„%s“ не може да �е обнови"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "указател�т „HEAD“ не може да бъде прочетен"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3537,11 +3696,11 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и промени индек�а и/или работното дърво\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3558,17 +3717,17 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�втоматично �катаното е приложено.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "„%s“ не може да бъде запазен"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3579,57 +3738,52 @@ msgstr ""
 "надеждно �катани.  Можете да пробвате да ги приложите чрез „git stash pop“\n"
 "или да ги изхвърлите чрез „git stash drop“, когато пои�кате.\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Спиране при „%s“…  %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "непозната команда %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "указател�т за „orig-head“ не може да �е прочете"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "указател�т за „onto“ не може да �е прочете"
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "„%s“ не може да �е обнови"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "„HEAD“ не може да бъде обновен до „%s“"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не може да пребазирате, защото има промени, които не �а в индек�а."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "не�ъще�твуващо подаване не може да �е поправи"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "неправилен файл: „%s“"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "неправилно �ъдържание: „%s“"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3639,38 +3793,38 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "промените в индек�а не могат да бъдат подадени."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не може да �е отбере „%s“"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: неправилна вер�и�"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "първоначалното подаване не може да бъде отменено"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: неподдържани опции"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: грешка при подготовката на вер�ии"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "неу�пешно изтриване на �пи�ъка за изпълнение: „%s“"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -3678,7 +3832,7 @@ msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „rebase.missingCommitsCheck“.  "
 "�а�тройката �е пре�кача."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3687,7 +3841,7 @@ msgstr ""
 "Предупреждение: н�кои подавани� може да �а пропу�нати.\n"
 "Пропу�нати подавани� (новите �а най-отгоре):\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3704,7 +3858,7 @@ msgstr ""
 "предупреждение)\n"
 "или „error“ (�читане за грешка).\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3715,21 +3869,26 @@ msgstr ""
 "continue“ �лед това.\n"
 "Може и да преу�тановите пребазирането � командата „git rebase --abort“.\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "„%s“ не може да бъде отворен за запи�"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "�криптът вече е преподреден."
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "„%s“ е извън хранилището"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3754,6 +3913,11 @@ msgstr ""
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "опци�та „%s“ тр�бва да е преди първи� аргумент, който не е опци�"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3761,82 +3925,153 @@ msgid ""
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"нееднозначен аргумент „%s: както вер�и�, така и път.\n"
+"нееднозначен аргумент „%s“: както вер�и�, така и път.\n"
 "Раздел�йте пътищата от вер�иите � „--“, ето така:\n"
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"не може да �е зададе текуща работна директори� при неправилни на�тройки"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "тази команда тр�бва да �е изпълни в работно дърво"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Очаква �е вер�и� на хранилището на git <= %d, а не %d"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "открити �а непознати разширени� в хранилището:"
 
-#: setup.c:811
+#: setup.c:533
+#, c-format
+msgid "error opening '%s'"
+msgstr "„%s“ не може да �е отвори"
+
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "прекалено гол�м файл „.git“: „%s“"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "грешка при прочитане на „%s“"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "неправилен формат на gitfile: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "лип�ва път в gitfile: „%s“"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "не е хранилище на Git: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "„%s“ е прекалено гол�м"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "не е хранилище на git: „%s“"
+
+#: setup.c:685 setup.c:687 setup.c:718
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "cannot chdir to '%s'"
+msgstr "не може да �е влезе в директори�та „%s“"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "проце�ът не може да �е върне към предишната работна директори�"
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
-"�ито тази, нито ко�то и да е от по-горните директории, не е хранилище на "
+"нито тази, нито ко�то и да е от по-горните директории, не е хранилище на "
 "git: %s"
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "Проце�ът не може да �е върне към предишната работна директори�"
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "не може да бъде получена информаци� чрез „stat“ за „%*s%s%s“"
 
-#: setup.c:1052
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "Текущата работна директори� не може да бъде прочетена"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "�е може да �е влезе в директори�та „%s“"
+msgid "cannot change to '%s'"
+msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"�ито тази, нито ко�то и да е от по-горните директории (до точката на "
+"нито тази, нито ко�то и да е от по-горните директории (до точката на "
 "монтиране „%s“), не е хранилище на git.\n"
 "Git работи в рамките на една файлова �и�тема, защото променливата на �редата "
 "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Зададени�т в „core.sharedRepository“ режим за до�тъп до файлове е неправилен "
+"зададени�т в „core.sharedRepository“ режим за до�тъп до файлове е неправилен "
 "(0%.3o).\n"
 "Соб�твеникът на файла тр�бва да има права за пи�ане и четене."
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "неу�пешно изпълнение на „open“ или „dup“ върху „/dev/null“"
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "неу�пешно изпълнение на „fork“"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "неу�пешно изпълнение на „setsid“"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "път�т „%s“ не �ъще�твува."
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "еталонното хранилище „%s“ не е локално"
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "еталонното хранилище „%s“ е плитко"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "еталонното хранилище „%s“ е � при�аждане"
@@ -3914,7 +4149,7 @@ msgstr "Път�т „%s“ е в подмодула „%.*s“"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "запи�ът за подмодула „%s“ (%s) е %s, а не подаване!"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
 
@@ -3938,7 +4173,7 @@ msgstr "командата „git status“ не може да �е изпълн
 msgid "submodule '%s' has dirty index"
 msgstr "индек�ът на подмодула „%s“ не е чи�т"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3946,18 +4181,18 @@ msgstr ""
 "не �е поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
 "работно дърво"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "името на подмодула „%s“ не може да бъде намерено"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3968,20 +4203,20 @@ msgstr ""
 "„%s“ към\n"
 "„%s“\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "неу�пешна обработка на поддиректориите в подмодула „%s“"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "„ls-stat“ не може да �е �тартира в „..“"
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ГРЕШК�: получени�т низ за път� не �ъвпада � върнатото от „cwd“"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "„ls-tree“ завърши � неочакван изходен код: %d"
@@ -4059,7 +4294,7 @@ msgstr "Клонът „%s“ ще �леди „%s“ от „%s“\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: неправилна опци� за дълбочина: %s"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -4068,7 +4303,7 @@ msgstr ""
 "Следните пътища за подмодули �ъдържат промени,\n"
 "които лип�ват от в�ички отдалечени хранилища:\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -4093,11 +4328,11 @@ msgstr ""
 "    git push\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "Преу�танов�ване на дей�твието."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Указател�т „%s“ не може да �е прочете."
@@ -4118,7 +4353,7 @@ msgstr "празно име на файл в запи� в дърво"
 msgid "too-short tree file"
 msgstr "прекалено кратък файл-дърво"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4127,7 +4362,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да преминете към нов клон."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4136,7 +4371,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4145,7 +4380,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да �леете."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4154,7 +4389,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4163,7 +4398,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да извършите „%s“."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4172,7 +4407,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4181,7 +4416,7 @@ msgstr ""
 "Обнов�ването на �ледните директории ще изтрие не�ледените файлове в т�х:\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4190,7 +4425,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да преминете на друг клон."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4199,7 +4434,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4208,7 +4443,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �леете."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4217,7 +4452,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4226,7 +4461,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4235,7 +4470,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4245,7 +4480,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �мените клон."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4255,7 +4490,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4264,7 +4499,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �леете."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4273,7 +4508,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4282,7 +4517,7 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4291,12 +4526,12 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запи�ът за „%s“ �ъвпада � този за „%s“.  �е може да �е при�вои."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4306,7 +4541,7 @@ msgstr ""
 "актуални:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4317,7 +4552,7 @@ msgstr ""
 "дърво:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4328,7 +4563,7 @@ msgstr ""
 "дърво:\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4337,12 +4572,12 @@ msgstr ""
 "Подмодулът не може да бъде обновен:\n"
 "„%s“"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "Преу�танов�ване на дей�твието\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "Изтегл�не на файлове"
 
@@ -4375,18 +4610,44 @@ msgstr "неправилен номер на порт"
 msgid "invalid '..' path segment"
 msgstr "неправилна ча�т от път� „..“"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "„%s“ не може да бъде прочетен"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "„%s“ в о�новното работно дърво не е директори�та на хранилището"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"файлът „%s“ не �ъдържа аб�олютни� път към ме�тоположението на работното дърво"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "„%s“ не �ъще�твува."
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "„%s“ не е файл на .git, код за грешка: %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "„%s“ не �очи към обратно към „%s“"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "„%s“ не може да бъде отворен и за четене, и за запи�"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "файлът не може да бъде прочетен: „%s“"
@@ -4400,161 +4661,161 @@ msgstr "н�ма до�тъп до „%s“"
 msgid "unable to get current working directory"
 msgstr "текущата работна директори� е недо�тъпна"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "�е�лети пътища:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (използвайте „git reset %s Ф�ЙЛ…“, за да извадите Ф�ЙЛа от индек�а)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (използвайте „git rm --cached %s Ф�ЙЛ…“, за да извадите Ф�ЙЛа от индек�а)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git add Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (използвайте „git add/rm Ф�ЙЛ…“, �поред решението, което избирате за "
 "конфликта)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git rm Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "Промени, които ще бъдат подадени:"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Промени, които не �а в индек�а за подаване:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (използвайте „git add Ф�ЙЛ…“, за да обновите �ъдържанието за подаване)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (използвайте „git add/rm Ф�ЙЛ…“, за да обновите �ъдържанието за подаване)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (използвайте „git checkout -- Ф�ЙЛ…“, за да отхвърлите промените в "
 "работното дърво)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (подайте или отхвърлете не�леденото или промененото �ъдържание в "
 "подмодулите)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (използвайте „git %s Ф�ЙЛ…“, за да определите какво включвате в подаването)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "изтрити в двата �луча�:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "добавени от ва�:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "изтрити от т�х:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "добавени от т�х:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "изтрити от ва�:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "добавени и в двата �луча�:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "променени и в двата �луча�:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "нов файл:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "копиран:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "изтрит:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "променен:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "преименуван:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "�м�на на вида:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "непозната пром�на:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "не�л�т:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "нови подавани�, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "променено �ъдържание, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "не�ледено �ъдържание, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Има %d �катаване."
 msgstr[1] "Има %d �катавани�."
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Подмодулите �а променени, но не �а обновени:"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Промени в подмодулите за подаване:"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4562,241 +4823,241 @@ msgstr ""
 "�е промен�йте и не изтривайте горни� ред.\n"
 "В�ичко отдолу ще бъде изтрито."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "��кои пътища не �а �лети."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (използвайте „git merge --abort“, за да преу�тановите �ливането)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�ички конфликти �а решени, но продължавате �ливането."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (използвайте „git commit“, за да завършите �ливането)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "В момента прилагате поредица от кръпки чрез „git am“."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "Текущата кръпка е празна."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (използвайте „git am --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (използвайте „git am --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "„git-rebase-todo“ лип�ва."
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "�е �а изпълнени команди."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "По�ледна изпълнена команда (изпълнена е общо %d команда):"
 msgstr[1] "По�ледна изпълнена команда (изпълнени �а общо %d команди):"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  повече информаци� има във файла „%s“)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "�е о�тават повече команди."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Следваща команда за изпълнение (о�тава още %d команда):"
 msgstr[1] "Следваща команда за изпълнение (о�тават още %d команди):"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 "  (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "В момента пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "В момента пребазирате."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (коригирайте конфликтите и използвайте „git rebase --continue“)"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (използвайте „git rebase --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (използвайте „git rebase --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (в�ички конфликти �а коригирани: изпълнете „git rebase --continue“)"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "В момента раздел�те подаване докато пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr "В момента раздел�те подаване докато пребазирате."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (След като работното ви дърво �тане чи�то, използвайте „git rebase --"
 "continue“)"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "В момента редактирате подаване докато пребазирате."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (използвайте „git commit --amend“, за да редактирате текущото подаване)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (използвайте „git rebase --continue“, �лед като завършите промените �и)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "В момента отбирате подаването „%s“."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (в�ички конфликти �а коригирани, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (използвайте „git cherry-pick --abort“, за да отмените в�ички дей�тви� � "
 "отбиране)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "В момента отмен�те подаване „%s“."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git revert --continue“)"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (в�ички конфликти �а коригирани, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (използвайте „git revert --abort“, за да преу�тановите отм�ната на "
 "подаване)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "В момента тър�ите двоично, като �те �тартирали от клон „%s“."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "В момента тър�ите двоично."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (използвайте „git bisect reset“, за да �е върнете към първоначалното "
 "�ъ�то�ние и клон)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "�а клон "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "извършвате интерактивно пребазиране върху "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "извършвате пребазиране върху "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "Указател�т „HEAD“ не е �вързан и е при "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Извън в�ички клони."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Първоначално подаване"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "В�е още лип�ват подавани�"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "�е�ледени файлове"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Игнорирани файлове"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4808,32 +5069,32 @@ msgstr ""
 "изпълнението, но не тр�бва да забрав�те ръчно да добав�те новите файлове.\n"
 "За повече подробно�ти погледнете „git status help“."
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�е�ледените файлове не �а изведени%s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (използвайте опци�та „-u“, за да изведете не�ледените файлове)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "��ма промени"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "към индек�а за подаване не �а добавени промени (използвайте „git add“ и/или "
 "„git commit -a“)\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "към индек�а за подаване не �а добавени промени\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4842,67 +5103,71 @@ msgstr ""
 "към индек�а за подаване не �а добавени промени, но има нови файлове "
 "(използвайте „git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "към индек�а за подаване не �а добавени промени, но има нови файлове\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "лип�ват каквито и да е промени (�ъздайте или копирайте файлове и използвайте "
 "„git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "лип�ват каквито и да е промени\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "лип�ват каквито и да е промени (използвайте опци�та „-u“, за да �е изведат и "
 "не�ледените файлове)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "лип�ват каквито и да е промени, работното дърво е чи�то\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "В�е още лип�ват подавани� в "
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (извън клон)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "различен"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "назад � "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "напред � "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "не може да извършите „%s“, защото има промени, които не �а в индек�а."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "о�вен това в индек�а има неподадени промени."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не може да извършите „%s“, защото в индек�а има неподадени промени."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "неу�пешно изтриване на „%s“"
@@ -4916,7 +5181,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
 msgid "unexpected diff status %c"
 msgstr "неочакван изходен код при генериране на разлика: %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "неу�пешно обнов�ване на файловете"
 
@@ -4965,7 +5230,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани �поред н�кой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4975,7 +5240,7 @@ msgstr "пробно изпълнение"
 msgid "interactive picking"
 msgstr "интерактивно отбиране на промени"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
@@ -5104,10 +5369,10 @@ msgstr "�ищо не е зададено и нищо не е добавено.\
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Веро�тно и�кахте да използвате „git add .“?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "файлът � индек�а е повреден"
 
@@ -5160,59 +5425,59 @@ msgstr "неправилно отме�тване на ча�ови� по��"
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "Кръпките не могат да бъдат разделени."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "След коригирането на този проблем изпълнете „%s --continue“."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "�ко предпочитате да пре�кочите тази кръпка, изпълнете „%s --skip“."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "За да �е върнете към първоначалното �ъ�то�ние, изпълнете „%s --abort“."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "Кръпката е празна."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "грешен ред � идентично�т: %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "подаването не може да бъде анализирано: %s"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището лип�ват необходимите обекти BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво �е рекон�труира от информаци�та в индек�а…"
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5220,39 +5485,30 @@ msgstr ""
 "Кръпката не може да �е приложи към обектите BLOB в индек�а.\n"
 "Да не би да �те � редактирали на ръка?"
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно �ливане…"
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "�еу�пешно �ливане на промените."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "Командата „git write-tree“ не у�п� да запише обект-дърво"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "прилагане върху празна и�тори�"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "обектът за подаването не може да бъде запи�ан"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да �е продължи — „%s“ не �ъще�твува."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "За интерактивно изпълнение е необходимо �тандартни�т\n"
 "вход да е �вързан � терминал, а в момента не е."
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "Т�лото на кръпката за прилагане е:"
 
@@ -5260,38 +5516,39 @@ msgstr "Т�лото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
 "на в�ичко:"
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "Индек�ът не е чи�т: кръпките не могат да бъдат приложени (замър�ени �а: %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Прилагане: %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Без промени — кръпката вече е приложена."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�еу�пешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "Дубликат на проблемната кръпка �е намира в: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+"За да видите неу�пешно приложени кръпки, използвайте опци�та „git am --show-"
+"current-patch“ to see the failed patch"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5301,7 +5558,7 @@ msgstr ""
 "�ко н�ма друга пром�на за включване в индек�а, най-веро�тно н�ко� друга\n"
 "кръпка е довела до �ъщите промени и в такъв �лучай про�то пропу�нете тази."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5312,17 +5569,17 @@ msgstr ""
 "След корекци� на конфликтите изпълнете „git add“ върху поправените файлове.\n"
 "За да приемете „изтрити от т�х“, изпълнете „git rm“ върху изтритите файлове."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "„%s“ не е разпознат като обект."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "индек�ът не може да бъде изчи�тен"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5333,138 +5590,147 @@ msgstr ""
 "�очи към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправилна �тойно�т за „--patch-format“: „%s“"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [(Ф�ЙЛ_С_ПОЩ�|ДИРЕКТОРИЯ_С_ПОЩ�)…]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "изо�тавена опци�, �ъще�твува по и�ториче�ки причини, нищо не прави"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "да �е преминава към тройно �ливане при нужда."
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "добав�не на ред за подпи� „Signed-off-by“ в �ъобщението за подаване"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (�тандартно)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опци�та „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опци�та „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опци�та „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "без подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ незави�имо "
 "от „am.keepcr“"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "пропу�кане на в�ичко преди реда за отр�зване"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "прекарване през „git-apply“"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "ФОРМ�Т"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "избрано от ва� �ъобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки �лед коригирането на конфликт"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "�иноними на „--continue“"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "пре�качане на текущата кръпка"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "въз�танов�ване на първоначалното �ъ�то�ние на клона и преу�танов�ване на "
 "прилагането на кръпката."
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+"преу�танов�ване на прилагането на кръпката без пром�на към кое �очи „HEAD“."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "показване на прилаганата кръпка."
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "дата за подаване различна от първоначалната"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "използване на текущото време като това за автор"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_КЛЮЧ"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "подпи�ване на подавани�та � GPG"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(ползва �е вътрешно за „git-rebase“)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5472,18 +5738,18 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не прав�т нищо и\n"
 "ще бъдат премахнати в бъдеще.  �е ги ползвайте."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "неу�пешно изчитане на индек�а"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директори� за пребазиране „%s“ в�е още �ъще�твува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5492,7 +5758,7 @@ msgstr ""
 "Открита е излишна директори� „%s“.\n"
 "Можете да � изтриете � командата „git am --abort“."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операци� по коригиране и н�ма как да �е продължи."
 
@@ -5514,8 +5780,9 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: Лип�ва адре� за отдалеченото хранилище"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: очакваше �е „ACK“/„NAK“, а бе получен „EOF“"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr ""
+"git archive: очакваше �е „ACK“/„NAK“, а бе получен изчи�тващ пакет „flush“"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5602,125 +5869,125 @@ msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗÐ�_ВЕРСИЯТÐ�…] [ВЕРÐ
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "ОПЦИИте_З�_ВЕРСИЯТ� �а документирани в ръковод�твото git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Извеждане на анотациите � намирането им, по�ледователно"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Извеждане на празни �уми по SHA1 за граничните подавани� (�тандартно опци�та "
 "е изключена)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "�ачалните подавани� да не �е �читат за гранични (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Извеждане на �тати�тика за извършените дей�тви�"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Принудително извеждане на напредъка"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Извеждане на допълнителна информаци� за определ�нето на анотациите"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr ""
 "Извеждане на първоначалното име на файл (�тандартно това е автоматично)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 "Извеждане на първоначални�т номер на ред (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Извеждане във формат за по-нататъшна обработка"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Извеждане във формат за команди от потребител�ко ниво � информаци� на в�еки "
 "ред"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Използване на �ъщи� формат като „git-annotate“ (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Извеждане на неформатирани времена (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Извеждане на пълните �уми по SHA1 (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Без име на автор и време на пром�на (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Извеждане на е-пощата на автора, а не името му (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "Без разлики в знаците за интервали"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Подобр�ване на разликите чрез ек�периментална еври�тика"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "Допълнителни изчи�лени� за по-добри резултати"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Изчитане на вер�иите от Ф�ЙЛ, а не чрез изпълнение на „git-rev-list“"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Използване на �ъдържанието на Ф�ЙЛа като крайно положение"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "напа�ване на редовете"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr ""
 "Тър�ене на копирани редове както в рамките на един файл, така и от един файл "
 "към друг"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr ""
 "Тър�ене на преме�тени редове както в рамките на един файл, така и от един "
 "файл към друг"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "Информаци� �амо за редовете в диапазона от n до m включително.  Броенето "
 "започва от 1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "опци�та „--progress“ е не�ъвме�тима � „--incremental“ и форма̀та на командите "
@@ -5734,18 +6001,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "преди 4 години и 11 ме�еца"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "има �амо %2$lu ред във файла „%1$s“"
 msgstr[1] "има �амо %2$lu реда във файла „%1$s“"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "�нотирани редове"
 
@@ -6037,17 +6304,17 @@ msgstr "извеждане �амо на не�летите клони"
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "КЛЮЧ"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "име на полето, по което да е подредбата"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "ОБЕКТ"
 
@@ -6055,16 +6322,16 @@ msgstr "ОБЕКТ"
 msgid "print only branches of the object"
 msgstr "извеждане �амо на клоните на ОБЕКТ�"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "ФОРМ�Т за изхода"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "В директори�та „refs/heads“ лип�ва файл „HEAD“"
 
@@ -6163,7 +6430,7 @@ msgstr "За �ъздаването на пратка е необходимо х
 msgid "Need a repository to unbundle."
 msgstr "За приемането на пратка е необходимо хранилище."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -6171,7 +6438,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6179,71 +6446,71 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), "
 "„tag“ (етикет)"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "извеждане на вида на обект"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "извеждане на размера на обект"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "изход � 0, когато н�ма грешка"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "форматирано извеждане на �ъдържанието на обекта"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 "да �е �тартира програмата зададена в на�тройката „textconv“ за преобразуване "
 "на �ъдържанието на обекта BLOB"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "да �е �тартират програмите за преобразуване на �ъдържанието на обектите BLOB"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "обект BLOB"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "опциите „--textconv“/„--filters“ изи�кват път"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "позвол�ване на опциите „-s“ и „-t“ да работ�т � повредени обекти"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "буфериране на изхода от „--batch“"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "извеждане на информаци� и �ъдържание на обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "извеждане на информаци� за обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "�ледване на �имволните връзки �очещи в дървото (ползва �е � „--batch“ или „--"
 "batch-check“)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "извеждане на в�ички обекти � „--batch“ или „--batch-check“"
 
@@ -6263,7 +6530,7 @@ msgstr "извеждане на в�ички атрибути, зададени
 msgid "use .gitattributes only from the index"
 msgstr "използване на файла „.gitattributes“ �амо от индек�а"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "изчитане на имената на файловете от �тандартни� вход"
 
@@ -6271,7 +6538,7 @@ msgstr "изчитане на имената на файловете от �та
 msgid "terminate input and output records by a NUL character"
 msgstr "раздел�не на входните и изходните запи�и � нулеви� знак „NUL“"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
@@ -6283,27 +6550,27 @@ msgstr "извеждане на не�ъвпадащите пътища"
 msgid "ignore index when checking"
 msgstr "пре�качане на индек�а при проверката"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "опци�та „--stdin“ е не�ъвме�тима � имена на пътища"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "опци�та „-z“ изи�ква „--stdin“"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "не е зададен път"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "опци�та „--quiet“ изи�ква да е подаден точно един път"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "опциите „--quiet“ и „--verbose“ �а не�ъвме�тими"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "опци�та „--non-matching“ изи�ква „--verbose“"
 
@@ -6361,9 +6628,9 @@ msgid "write the content to temporary files"
 msgstr "запи�ване на �ъдържанието във временни файлове"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "�ИЗ"
 
@@ -6408,81 +6675,81 @@ msgstr "н�ко� от необходимите вер�ии лип�ва в п
 msgid "path '%s': cannot merge"
 msgstr "път�т „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Резултатът за „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "Опци�та „%s“ е не�ъвме�тима � обнов�ването на пътища"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "Опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "�евъзможно е едновременно да обнов�вате пътища и да преминете към клона „%s“."
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "път�т „%s“ не е �л�т"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "първо тр�бва да коригирате индек�а �и"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да �е про�леди: %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "Указател�т „HEAD“ в момента �очи към"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде обновен"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Занул�ване на клона „%s“\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Вече �те на „%s“\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Преминаване към клона „%s“ и занул�ване на промените\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към нови� клон „%s“\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Преминахте към клона „%s“\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "… и още %d.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6504,7 +6771,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6531,164 +6798,164 @@ msgstr[1] ""
 " git branch ИМЕ_��_�ОВИЯ_КЛО� %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "вътрешна грешка при обхождането на вер�иите"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ �очеше към"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "В момента �те на клон, който пред�тои да бъде �ъздаден"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "очакваше �е един указател, а �те подали %d."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указател�т не �очи към обект-дърво: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е не�ъвме�тимо � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "опци�та „%s“ е не�ъвме�тима � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който �очи към подаване.  „%s“ "
 "не е такъв"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "клон"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "�ъздаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "задаване на кой клон бива �леден при �ъздаването на нови� клон"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "�ОВ_КЛО�"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "изтегл�не на вашата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "изтегл�не на чуждата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "принудително изтегл�не (вашите промени ще бъдат занулени)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно �ливане � нови� клон"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "обнов�ване на игнорираните файлове (�тандартно)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "СТИЛ"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "дей�твие при конфликт (�ливане или тройна разлика)"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища �амо до ча�тично изтеглените"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git checkout "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указател�"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "извеждане на напредъка"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Опциите „-b“, „-B“ и „--orphan“ �а не�ъвме�тими една � друга"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "опци�та „--track“ изи�ква име на клон"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Лип�ва име на клон, използвайте опци�та „-b“"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "„%s“ не е подаване, затова от него не може да �е �ъздаде клон „%s“"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: опци�та „--detach“ не приема аргумент-път „%s“"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6787,7 +7054,7 @@ msgid "Remove %s [y/N]? "
 msgstr "Да �е изтрие ли „%s“? „y“ —  да, „N“ — �Е"
 
 #
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Изход.\n"
@@ -6810,11 +7077,11 @@ msgstr ""
 "help                — този край\n"
 "?                   — под�казка за шаблоните"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "��� Команди ���"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "Избор на �ледващо дей�твие"
 
@@ -6844,8 +7111,8 @@ msgstr "интерактивно изтриване"
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6884,148 +7151,148 @@ msgstr ""
 "което изи�ква н�ко� от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши "
 "изчи�тване"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ДИРЕКТОРИЯ]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "без �ъздаване на работно дърво"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "�ъздаване на голо хранилище"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 "�ъздаване на хранилище-огледало (включва опци�та „--bare“ за голо хранилище)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "клониране от локално хранилище"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "без твърди връзки, файловете винаги да �е копират"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "на�тройване за �поделено хранилище"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "път"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "инициализиране на подмодулите при това клониране"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "брой подмодули, клонирани паралелно"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "директори� � шаблони"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "директори�, ко�то �ъдържа шаблоните, които да �е ползват"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "еталонно хранилище"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "опци�та „--reference“ може да �е използва �амо при клониране"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "ИМЕ"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "използване на това ИМЕ вме�то „origin“ при про�лед�ване на клони"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "изтегл�не на този КЛО�, а не �очени�т от отдалечени� указател „HEAD“"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "ДЪЛБОЧИ��"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИ��"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "ВРЕМЕ"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "плитко клониране до момент във времето"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "вер�и�"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до изключващ указател"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране �амо на един клон — или �очени� от отдалечени� „HEAD“, или изрично "
 "зададени� � „--branch“"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "без клониране на етикети, като по�ледващите до�тав�ни� н�ма да ги �лед�т"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "в�ички клонирани подмодули ще �а плитки"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "СЛУЖЕБ��_ДИРЕКТОРИЯ"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "отделна СЛУЖЕБ��_ДИРЕКТОРИЯ за git извън работното дърво"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "КЛЮЧ=СТОЙ�ОСТ"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "задаване на на�тройките на новото хранилище"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "�амо адре�и IPv4"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "�амо адре�и IPv6"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -7033,43 +7300,43 @@ msgstr ""
 "Името на директори�та не може да бъде отгатнато.\n"
 "Задайте директори�та изрично на командни� ред"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: не може да �е добави алтернативен източник на „%s“: %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "„%s“ �ъще�твува и не е директори�"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "връзката „%s“ не може да бъде �ъздадена"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "файлът не може да бъде копиран като „%s“"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "дей�твието завърши.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -7080,103 +7347,103 @@ msgstr ""
 "клон в момента �а изтеглени � командата „git status“.  Можете да\n"
 "завършите изтегл�нето на клона � командата „git checkout -f HEAD“.\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
 "и който �ледва да бъде изтеглен, не �ъще�твува."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "отдалеченото хранилище не изпрати в�ички необходими обекти."
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "обектът „%s“ не може да бъде обновен"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "указател�т „HEAD“ от отдалеченото хранилище �очи към нещо,\n"
 "което не �ъще�твува.  �е може да �е изтегли определен клон.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "работното дърво не може да бъде подготвено"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "на�тройките не могат да бъдат запи�ани в конфигурационни� файл"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "не може да �е извърши пакетиране за изчи�тване на файловете"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "временни�т файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "Тр�бва да укажете кое хранилище и�кате да клонирате."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "опциите „--bare“ и „--origin %s“ �а не�ъвме�тими."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "опциите „--bare“ и „--separate-git-dir“ �а не�ъвме�тими."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не �ъще�твува хранилище „%s“"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината тр�бва да е положително ц�ло чи�ло, а не „%s“"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целеви�т път „%s“ �ъще�твува и не е празна директори�."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече �ъще�твува работно дърво."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "родител�ките директории на „%s“ не могат да бъдат �ъздадени"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "работното дърво в „%s“ не може да бъде �ъздадено."
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клониране и �ъздаване на голо хранилище в „%s“…\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клониране и �ъздаване на хранилище в „%s“…\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -7184,38 +7451,44 @@ msgstr ""
 "Опци�та „--recursive“ е не�ъвме�тима � опциите „--reference“ и „--reference-"
 "if-able“"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--depth“ �е пре�кача.  Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-since“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-exclude“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+"При локално клониране опци�та „--filter“ �е пре�кача.  Ползвайте �хемата "
+"„file://“."
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "клонираното хранилище е плитко, затова опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Отдалечени�т клон „%s“ лип�ва в клонираното хранилище „%s“"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Изглежда клонирахте празно хранилище."
 
@@ -7251,70 +7524,15 @@ msgstr "Поле в знаци между колоните"
 msgid "--command must be the first argument"
 msgstr "опци�та „--command“ тр�бва да е първи�т аргумент"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Името и адре�ът за е-поща �а на�троени автоматично на базата на името на\n"
-"потребител� и името на машината.  Проверете дали �а верни.  Можете да "
-"�прете\n"
-"това �ъобщение като изрично зададете �тойно�тите.  Изпълнете �ледната "
-"команда\n"
-"и �ледвайте ин�трукциите в тек�тови� ви редактор, за да редактирате\n"
-"конфигурационни� файл:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"След като направите това, можете да коригирате информаци�та за автора на\n"
-"текущото подаване чрез:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Името и адре�ът за е-поща �а на�троени автоматично на базата на името на\n"
-"потребител� и името на машината.  Проверете дали �а верни.  Можете да "
-"�прете\n"
-"това �ъобщение като изрично зададете �тойно�тите:\n"
-"\n"
-"    git config --global user.name \"Вашето Име\"\n"
-"    git config --global user.email пенчо@example.com\n"
-"\n"
-"След като направите това, можете да коригирате информаци�та за автора на\n"
-"текущото подаване чрез:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7326,7 +7544,7 @@ msgstr ""
 "� опци�та „--allow-empty“, или да го изтриете от и�тори�та � командата:\n"
 "„git reset HEAD^“.\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7341,11 +7559,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "В противен �лучай използвайте командата „git reset“\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7361,61 +7579,61 @@ msgstr ""
 "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
 "о�таналите подавани�.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "временни�т индек� не може да бъде �ъздаден"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "неу�пешно интерактивно добав�не"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "временни�т индек� не може да бъде обновен"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "Дървото на о�новни� кеш не може да бъде обновено"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "нови�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "по време на �ливане не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "временни�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "заглавната ча�т за автор в подаването „%s“ лип�ва"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "заглавната ча�т за автор в подаването „%s“ е неправилна"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "неправилен параметър към опци�та „--author“"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7423,38 +7641,38 @@ msgstr ""
 "не може да �е избере знак за коментар — в текущото �ъобщение за подаване �а "
 "използвани в�ички подобни знаци"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�ледното подаване не може да бъде открито: %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(изчитане на �ъобщението за подаване от �тандартни� вход)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "�ъобщението за подаване не бе прочетено �тандартни� вход"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "файлът �ъ� �ъобщението за подаване „%s“ не може да бъде прочетен"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "�ъобщението за �мачкване SQUASH_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "�ъобщението за �ливане MERGE_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "шаблонът за подаване не може да бъде запазен"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7469,7 +7687,7 @@ msgstr ""
 "  %s\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7485,7 +7703,7 @@ msgstr ""
 "  %s\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7494,7 +7712,7 @@ msgstr ""
 "Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
 "� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7505,150 +7723,154 @@ msgstr ""
 "� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.  Празно \n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:   %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:    %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sПодаващ: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Подайте �ъобщението � н�ко� от опциите „-m“ или „-F“.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "Опци�та „--author '%s'“ не отговар� на форма̀та „Име <е-поща>“ и не �ъвпада � "
 "никой автор"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "�еправилен режим за игнорираните файлове: „%s“"
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправилен режим за не�ледените файлове: „%s“"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "Опциите „--long“ и „-z“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Опциите „--reset-author“ и „--author“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "��ма какво да бъде поправено."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "В момента �е извършва �ливане, не можете да поправ�те."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "В момента �е извършва отбиране на подаване, не можете да поправ�те."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "Опци�та „-m“ е не�ъвме�тима � „-c“, „-C“, „-F“ и „--fixup“."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Опци�та „-m“ е не�ъвме�тима � „-c“, „-C“ и „-F“."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Опци�та „--reset-author“ може да �е използва �амо заедно � „-C“, „-c“ или\n"
 "„--amend“."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ �а\n"
 "не�ъвме�тими."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "Опциите „--include“ и „--only“ изи�кват аргументи."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�е�ъще�твуващ режим на изчи�тване „%s“"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "Опци�та „-a“ е не�ъвме�тима �ъ� задаването на пътища."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "кратка информаци� за �ъ�то�нието"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "информаци� за клоните"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "информаци� за �катаното"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "изчи�л�ване на точните �тойно�ти напред/назад"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "подробна информаци� за �ъ�то�нието (�тандартно)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "раздел�не на елементите � нулеви� знак „NUL“"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "РЕЖИМ"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "извеждане на не�ледените файлове.  Възможните РЕЖИМи �а „all“ (подробна "
 "информаци�), „normal“ (кратка информаци�), „no“ (без не�ледените файлове).  "
 "Стандартни�т РЕЖИМ е: „all“."
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -7657,11 +7879,11 @@ msgstr ""
 "„traditional“ (традиционен), „matching“ (напа�ващи), „no“ (без игнорираните "
 "файлове).  Стандартни�т РЕЖИМ е: „traditional“."
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "КОГ�"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7670,216 +7892,190 @@ msgstr ""
 "една от „all“ (в�ички), „dirty“ (тези � неподадени промени), "
 "„untracked“ (не�ледени)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "извеждане на не�ледените файлове в колони"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�еподдържана комбинаци� от аргументи за игнорирани и не�ледени файлове"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "току що �ъздаденото подаване не може да бъде открито"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "току що �ъздаденото подаване не може да бъде анализирано"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr ""
-"�ъ�то�нието �очено от указател� „HEAD“ не може да бъде открито �лед "
-"подаването"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "не�вързан връх „HEAD“"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (начално подаване)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "без информаци� �лед у�пешно подаване"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "добав�не на разликата към шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Опции за �ъобщението при подаване"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "взимане на �ъобщението от Ф�ЙЛ"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "�ВТОР"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "задаване на �ВТОР за подаването"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "Д�Т�"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "задаване на Д�Т� за подаването"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "СЪОБЩЕ�ИЕ"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "СЪОБЩЕ�ИЕ при подаване"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "ПОД�В��Е"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "преизползване и редактиране на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "преизползване на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение при �мачкване за вкарване на указаното "
 "ПОД�В��Е в предното без �леда"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение при �мачкване за �мачкване на "
 "указаното ПОД�В��Е в предното"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "�м�на на автора да �ъвпада � подаващи� (използва �е � „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "добав�не на поле за подпи� — „Signed-off-by:“"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "използване на указани� шаблонен Ф�ЙЛ"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "�тандартно"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "кои празни знаци и #коментари да �е махат от �ъобщени�та"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "вмъкване на �ъ�то�нието в шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "подпи�ване на подаването � GPG"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "подаване на в�ички променени файлове"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "добав�не на указаните файлове към индек�а за подаване"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "интерактивно добав�не на файлове"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "интерактивно добав�не на промени"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "подаване �амо на указаните файлове"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и при пром�на на �ъобщението за "
 "подаване (pre-commit и commit-msg)"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "поправ�не на предишното подаване"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката �лед презапи�ване (post-rewrite)"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "позвол�ване на празни подавани�"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "позвол�ване на подавани� � празни �ъобщени�"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за �ливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "режимът на �ливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�ъобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -8080,7 +8276,7 @@ msgstr "извеждане на размерите на обектите във
 
 #: builtin/describe.c:22
 msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [ОПЦИЯ…] УК�З�ТЕЛ_КЪМ_ПОД�В��Е…"
+msgstr "git describe [ОПЦИЯ…] [УК�З�ТЕЛ_КЪМ_ПОД�В��Е…]"
 
 #: builtin/describe.c:23
 msgid "git describe [<options>] --dirty"
@@ -8113,22 +8309,22 @@ msgstr "в анотираниÑ� етикет „%s“ липÑ�ва вградеÐ
 msgid "tag '%s' is really '%s' here"
 msgstr "етикетът „%s“ тук е в�ъщно�т „%s“"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "никой етикет не напа�ва точно „%s“"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "�ико� вер�и� и етикет не напа�ват точно.  Тър�и �е по опи�ание\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "тър�енето приключи при „%s“\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -8137,7 +8333,7 @@ msgstr ""
 "�икой анотиран етикет не опи�ва „%s“.\n"
 "Съще�твуват и неанотирани етикети.  Пробвайте � опци�та „--tags“."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -8146,12 +8342,12 @@ msgstr ""
 "�икой етикет не опи�ва „%s“.\n"
 "Пробвайте � опци�та „--always“ или �ъздайте етикети."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "претър�ени �а %lu подавани�\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -8160,93 +8356,93 @@ msgstr ""
 "открити �а над %i етикета, изведени �а по�ледните %i,\n"
 "тър�енето бе прекратено при „%s“.\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "опи�ание на „%s“\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�еправилно име на обект „%s“"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "„%s“ не е нито подаване, нито обект BLOB"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "откриване на етикета, който �ледва подаване"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr ""
 "извеждане на информаци� за тра�иране на �тратеги�та за тър�ене на "
 "�тандартната грешка"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "използване на произволен указател"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "използване на в�еки етикет — включително и неанотираните"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "винаги да �е ползва дълги�т формат"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "про�лед�ване �амо на първи� родител"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "извеждане �амо на точните �ъвпадени�"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "да �е тър�и �амо в този БРОЙ по�ледни етикети (�тандартно: 10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "да �е тър�и �амо измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "да не �е тър�и измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "извеждане на �ъкратено име на обект като резервен вариант"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "М�РКЕР"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добав�не на такъв М�РКЕР на работното дърво (�тандартно е „-dirty“)"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "добав�не на такъв М�РКЕР на �чупеното работно дърво (�тандартно е „-broken“)"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "Опциите „--long“ и „--abbrev=0“ �а не�ъвме�тими"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "�е �а открити имена — нищо не може да бъде опи�ано."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "опци�та „--dirty“ е не�ъвме�тима � указател към подаване"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "опци�та „--broken“ е не�ъвме�тима � указател към подаване"
 
@@ -8435,95 +8631,101 @@ msgstr "Прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към из
 msgid "anonymize output"
 msgstr "анонимизиране на извежданата информаци�"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [ОПЦИЯ…] ГРУП�"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [ОПЦИЯ…] [(ХР��ИЛИЩЕ | ГРУП�)…]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ОПЦИЯ…]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "до�тав�не от в�ички отдалечени хранилища"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "добав�не към „.git/FETCH_HEAD“ вме�то зам�на"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "отдалечен път, където да �е качи пакетът"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "принудително презапи�ване на локални� клон"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "до�тав�не от множе�тво отдалечени хранилища"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "до�тав�не на в�ички етикети и принадлежащи обекти"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "без до�тав�нето на в�ички етикети „--no-tags“"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "брой подмодули до�тавени паралелно"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ока�тр�не на клоните �лед�щи вече не�ъще�твуващи отдалечени клони"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"ока�тр�не на локалните етикети, които вече не �ъще�твуват в отдалеченото "
+"хранилище и махане на променените"
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "ПРИ �УЖД�"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "запазване на изтеглените пакети � обекти"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "позвол�ване на обнов�ването на указател� „HEAD“"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "задълбочаване на и�тори�та на плитко хранилище"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до определено време"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "превръщане в пълно хранилище"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "директори�"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "добав�не на това пред път� на подмодула"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8531,91 +8733,91 @@ msgstr ""
 "�тандартно рекур�ивно изтегл�не на подмодулите (файловете � на�тройки �а � "
 "приоритет)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "приемане на указатели, които обнов�ват „.git/shallow“"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "К�РТ�_С_УК�З�ТЕЛИ"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "указване на К�РТ�та_С_УК�З�ТЕЛИ за до�тав�не"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "Указател�т „HEAD“ в отдалеченото хранилище не може да бъде открит"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "на�тройката „fetch.output“ е � неправилна �тойно�т „%s“"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ лип�ва"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[актуализиран]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "в текущи� клон не може да �е до�тав�"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[обнов�ване на етикетите]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "локален указател не може да бъде обновен"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "принудително обнов�ване"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "�ъщин�ко �ливане"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати в�ички необходими обекти\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "отхвърл�не на върха „%s“, защото плитките хранилища не могат да бъдат "
 "обнов�вани"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8625,50 +8827,57 @@ msgstr ""
 "„git remote prune %s“, за да премахнете о�тарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще �е окаже извън клон)"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "�е може да до�тавите в текущи� клон „%s“ на хранилище, което не е голо"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Стойно�тта „%2$s“ за опци�та „%1$s“ не е �ъвме�тима � „%3$s“"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Опци�та „%s“ �е пре�кача при „%s“\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "До�тав�не на „%s“\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "„%s“ не може да �е до�тави"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"опци�та „--filter“ може да �е ползва �амо � отдалеченото хранилище указано в "
+"на�тройката „core.partialClone“"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8676,41 +8885,41 @@ msgstr ""
 "�е �те указали отдалечено хранилище.  Задайте или адре�, или име\n"
 "на отдалечено хранилище, откъдето да �е до�тав�т новите вер�ии."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Тр�бва да укажете име на етикет."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "Опциите „--deepen“ и „--depth“ �а не�ъвме�тими една � друга"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "опциите „--depth“ и „--unshallow“ �а не�ъвме�тими"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "не можете да използвате опци�та „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 "към „git fetch --all“ не можете да добавите аргумент — указател на вер�и�"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "��ма нито отдалечено хранилище, нито група от хранилища на име „%s“"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Указването на група и указването на вер�и� �а не�ъвме�тими"
 
@@ -8778,7 +8987,7 @@ msgstr "цитиране подход�що за tcl"
 msgid "show only <n> matched refs"
 msgstr "извеждане �амо на този БРОЙ напа�нати указатели"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "�пазване на цветовете на форма̀та"
 
@@ -8802,64 +9011,64 @@ msgstr "извеждане �амо на указателите, които �ъ
 msgid "print only refs which don't contain the commit"
 msgstr "извеждане �амо на указателите, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "Проверка на директориите � обекти"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "показване на недо�тижимите обекти"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индек�а да �а коренови"
 
 # FIXME bad message
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "про�лед�ване на указателите от журнала като глави (�тандартно)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да �е провер�ват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "проверка �амо на връзката"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "по-�троги проверки"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директори�та „.git/lost-found“"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "показване на подробни имена на до�тижимите обекти"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
@@ -8906,37 +9115,37 @@ msgstr "изчерпателно тър�ене на боклука (за �ме
 msgid "enable auto-gc mode"
 msgstr "включване на автоматичното �ъбиране на боклука (auto-gc)"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "изрично �тартиране на �ъбирането на боклука, дори и ако вече работи друго "
 "�ъбиране"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "�еразпозната �тойно�т на „gc.logexpiry“: %s"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "�втоматично пакетиране на заден фон на хранилището за по-добра "
 "производително�т.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "�втоматично пакетиране на хранилището за по-добра производително�т.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 "Погледнете ръковод�твото за повече информаци� как да изпълните „git help "
 "gc“.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8945,7 +9154,7 @@ msgstr ""
 "проце�а: %<PRIuMAX> (ако �те �игурни, че това не е в�рно, това използвайте\n"
 "опци�та „--force“)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8956,12 +9165,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ОПЦИЯ…] [-e] Ш�БЛО� [ВЕРСИЯ…] [[--] ПЪТ…]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: неу�пешно �ъздаване на нишка: %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -8970,259 +9179,259 @@ msgstr "зададен е неправилен брой нишки (%d) за %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "лип�ва поддръжка за нишки.  „%s“ ще �е пренебрегне"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "дървото не може да бъде прочетено (%s)"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не може да �е изпълни „grep“ от обект от вида %s"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "опци�та „%c“ очаква чи�ло за аргумент"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "тър�ене в индек�а, а не в работното дърво"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "тър�ене и във файловете, които не �а под управлението на git"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "тър�ене и в �ледените, и в не�ледените файлове"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнориране на файловете указани в „.gitignore“"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "рекур�ивно тър�ене във в�ички подмодули"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "извеждане на редовете, които не �ъвпадат"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "без значение на реги�търа на буквите (главни/малки)"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "напа�ване на шаблоните �амо по границите на думите"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "обработване на двоичните файлове като тек�тови"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "пре�качане на двоичните файлове"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr ""
 "обработване на двоичните файлове чрез филтри за преобразуване към тек�т"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "навлизане мак�имално на тази ДЪЛБОЧИ�� в дървото"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "разширени регул�рни изрази по POSIX"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "о�новни регул�рни изрази по POSIX (�тандартно)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "шаблоните �а до�ловни низове"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "регул�рни изрази на Perl"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "извеждане на номерата на редовете"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "без извеждане на имената на файловете"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "извеждане на имената на файловете"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr ""
 "извеждане на отно�ителните имена на файловете �пр�мо о�новната директори� на "
 "хранилището"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "извеждане �амо на имената на файловете без напа�ващите редове"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "�иноним на „--files-with-matches“"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr ""
 "извеждане �амо на имената на файловете, които не �ъдържат ред, напа�ващ на "
 "шаблона"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "извеждане на нулеви� знак „NUL“ �лед в��ко име на файл"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "извеждане на бро� на �ъвпадени�та вме�то напа�ващите редове"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "оцвет�ване на напа�вани�та"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "извеждане на празен ред между напа�вани�та от различни файлове"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
 "извеждане на името на файла �амо веднъж за в�ички напа�вани� от този файл"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "извеждане на такъв БРОЙ редове преди и �лед напа�вани�та"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "извеждане на такъв БРОЙ редове преди напа�вани�та"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "извеждане на такъв БРОЙ редове �лед напа�вани�та"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "използване на такъв БРОЙ работещи нишки"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "�иноним на „-C БРОЙ“"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "извеждане на ред � името на функци�та, в ко�то е напа�нат шаблона"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "извеждане на обхващащата функци�"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "изчитане на шаблоните от Ф�ЙЛ"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "напа�ване на Ш�БЛО�"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "комбиниране на шаблоните указани � опци�та „-e“"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr ""
 "без извеждане на �тандартни� изход.  Изходни�т код указва наличието на "
 "напа�ване"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "извеждане на редове �амо от файловете, които напа�ват на в�ички шаблони"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "извеждане на дървото за анализ на регул�рни� израз"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "програма за преглед по �траници"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "извеждане на �ъвпадащите файлове в програма за преглед по �траници"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "позвол�ване на �тартирането на grep(1) (текущи�т компилат пренебрегва тази "
 "опци�)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "лип�ва шаблон."
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � вер�ии."
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "вер�и�та „%s“ не може бъде открита"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "зададен е неправилен брой нишки: %d"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "лип�ва поддръжка за нишки.  „--threads“ ще �е пренебрегне"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "опци�та „--open-files-in-pager“ е �ъвме�тима �амо � тър�ене в работното дърво"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "опци�та е не�ъвме�тима � „--recurse-submodules“."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � „--no-index“."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "опциите „--(no-)exclude-standard“ �а не�ъвме�тими � тър�ене по �ледени "
 "файлове."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "опци�та „--cached“ е не�ъвме�тима �ъ� задаване на дърво."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -9230,38 +9439,38 @@ msgstr ""
 "git hash-object [-t ВИД] [-w] [--path=Ф�ЙЛ | --no-filters] [--stdin] [--] "
 "Ф�ЙЛ…"
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "ВИД"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "ВИД на обекта"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "запи�ване на обекта в базата от данни за обектите"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "изчитане на обекта от �тандартни� вход"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "запазване на файла както е — без филтри"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "�ъздаване и хеширане на произволни данни за повредени обекти за тра�иране на "
 "Git"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "обработване на Ф�ЙЛа в�е едно е � този път"
 
@@ -9395,154 +9604,154 @@ msgstr "„%s“ е �иноним на „%s“"
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "обектът „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "неправилен вид на обекта „%s“"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "очаквани�т обект „%s“ не бе получен"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "неправилен вид на обекта „%s“: очакваше �е „%s“, а бе получен „%s“"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "не може да �е запълни %d байт"
 msgstr[1] "не може да �е запълн�т %d байта"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "неочакван край на файл"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "грешка при четене на входните данни"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "използвани �а повече от наличните байтове"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "пакетни�т файл е прекалено гол�м за текущата �тойно�т на типа „off_t“"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "пакетни�т файл надвишава мак�имални� възможен размер"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде �ъздаден"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "не�ъответ�твие в подпи�а към пакетни� файл"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "не �е поддържа пакетиране вeр�и� „%<PRIu32>“"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "повреден обект в пакетни� файл при отме�тване %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "декомпре�ирането � „inflate“ върна %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "�тойно�тта на отме�тването за обекта-разлика води до препълване"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "�тойно�тта на отме�тването за обекта-разлика е извън диапазона"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "непознат вид обект %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "пакетни�т файл не може да бъде прочетен"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "неочакван край на файл, лип�ва %<PRIuMAX> байт"
 msgstr[1] "неочакван край на файл, лип�ват %<PRIuMAX> байта"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "�ериозна грешка при декомпре�иране � „inflate“"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 "СЪВП�ДЕ�ИЕ �� СТОЙ�ОСТИТЕ З� СУМИТЕ З� SHA1: „%s“ �� ДВ� Р�ЗЛИЧ�И ОБЕКТ�!"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "обектът „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�ъще�твуващи�т обект в „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�ъще�твуващи�т обект „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправилен обект BLOB „%s“"
 
 # FIXME perhaps invalid object
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "неправилен обект „%s“"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Грешка в обекта"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "��кои обекти, на�ледници на „%s“, не могат да бъдат до�тигнати"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "разликата не може да бъде приложена"
 
@@ -9620,80 +9829,81 @@ msgstr "добавени�т обект не може да �е компре�и
 msgid "local object %s is corrupt"
 msgstr "локални�т обект „%s“ е повреден"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "грешка при затвар�нето на пакетни� файл"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "името на пакетни� файл „%s“ не завършва на „.pack“"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr ""
-"грешка при запи�ването на файла „%s“, о�игур�ващ запазване на директори�"
+msgid "cannot write %s file '%s'"
+msgstr "грешка при запи� на файла „%s“ „%s“"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr ""
-"грешка при затвар�нето на запи�ани� файл „%s“, о�игур�ващ запазване на "
-"директори�"
+msgid "cannot close written %s file '%s'"
+msgstr "грешка при затвар�нето на запи�ани� файл „%s“ „%s“"
+
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "грешка при затвар�нето на пакетни� файл"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "пакетни�т файл не може да бъде запазен"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "файлът за индек�а не може да бъде �ъхранен"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "зададена е неправилна вер�и� пакетиране: „pack.indexversion=%<PRIu32>“"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Съще�твуващи�т пакетен файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Съще�твуващи�т индек� за пакетни� файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d обект не е разлика"
 msgstr[1] "%d обекта не �а разлика"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "дължината на веригата е %d: %lu обект"
 msgstr[1] "дължината на веригата е %d: %lu обекта"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "името на пакетни� файл „%s“ не завършва на „.pack“"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "Проце�ът не може да �е върне към предишната работна директори�"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "неправилна �тойно�т „%s“"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "опци�та „--fix-thin“ изи�ква „--stdin“"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "„--stdin“ изи�ква хранилище на git"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "опци�та „--verify“ изи�ква име на пакетен файл"
 
@@ -9880,124 +10090,124 @@ msgstr "опци�та „--trailer“ е не�ъвме�тима � „--name-
 msgid "no input file given for in-place editing"
 msgstr "не е зададен входен файл за редактиране на м��то"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] ПЪТ…]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправилна опци� „--decorate“: %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "без извеждане на разликите"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "извеждане на изходни� код"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr ""
 "Използване на файл за �ъответ�тви�та на имената и адре�ите на е-поща („."
 "mailmap“)"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "�пециален формат �амо на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "без �пециален формат на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "на�тройки на форма̀та на извежданата информаци�"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Обработване �амо на редовете във файла в диапазона от n до m включително.  "
 "Броенето започва от 1"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "Обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "�еизве�тен вид: %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "не е зададена �тойно�т на „format.headers“"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "прекалено дълго име на директори�та за изходната информаци�"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Тр�бва да зададете точно един диапазон."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "�е е диапазон."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "Придружаващото пи�мо тр�бва да е форматирано като е-пи�мо"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната ча�т за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИ�П�ЗО�_��_ВЕРСИИТЕ]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "Можете да укажете мак�имум една директори� за изход."
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "�епознато подаване „%s“"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е може да �е открие към какво �очи „%s“."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "Точната база за �ливане не може да �е открие."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -10007,234 +10217,234 @@ msgstr ""
 "зададете, използвайте „git branch --set-upstream-to“.\n"
 "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "Точната база при �ливане не може да бъде открита"
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовото подаване тр�бва да е предше�твеникът на �пи�ъка � вер�иите"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "базовото подаване не може да е в �пи�ъка � вер�иите"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "идентификаторът на кръпката не може да бъде получен"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номераци� „[PATCH n/m]“ дори и при един�твена кръпка"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "номераци� „[PATCH]“ дори и при множе�тво кръпки"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на �тандартни� изход"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "�ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "про�та чи�лова по�ледователно�т за имената на файловете-кръпки"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "З��ЦИ"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези З��ЦИ за �уфик� вме�то „.patch“"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не � 1"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "отбел�зване, че това е N-тата поредна редакци� на поредицата от кръпки"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Използване на „[RFC PATCH]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "без добав�не/махане на префик�а „[PATCH]“"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "в заглавната ча�т „From:“ (от) хешът да е �амо от нули"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "да не �е включват кръпки, които при�ъ�тват в �ледени� клон"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в �тандартни� (кръпка и �тати�тика)"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "добав�не на тази З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "Е-ПОЩ�"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "добав�не на заглавна ча�т „To:“ (до)"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "добав�не на заглавна ча�т „Cc:“ (и до)"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "ИДЕ�ТИЧ�ОСТ"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адре�а в заглавната ча�т „From“ (от) да е тази ИДЕ�ТИЧ�ОСТ.  �ко "
 "не е зададена такава, �е взима адре�а на подаващи�"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото �ъобщение да е в отговор на е-пи�мото � този "
 "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "прикреп�не на кръпката"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "включване на кръпката в тек�та на пи�мата"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "използване на нишки за �ъобщени�та.  СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "подпи�"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "добав�не на поле за подпи�"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "Б�ЗОВО_ПОД�В��Е"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "добав�не на необходимото Б�Зово дърво към �ери�та кръпки"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "добав�не на подпи� от файл"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "извеждане на напредъка във фазата на �ъздаване на кръпките"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентично�т: %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "опциите „-n“ и „-k“ �а не�ъвме�тими."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ �а не�ъвме�тими."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "опци�та „--name-only“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "опци�та „--name-status“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "опци�та „--check“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr ""
 "изходът може да или �тандартни�т, или да е в директори�, но не и двете."
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ � подпи� не може да бъде прочетен"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "Създаване на кръпки"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "Изходните файлове не могат да бъдат �ъздадени"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТД�ЛЕЧЕ�_КЛО� [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10390,7 +10600,7 @@ msgstr "взимане предвид на „url.Б�З�.insteadOf“"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "изход � код 2, ако не �е откри�т �ъвпадащи указатели"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "извеждане на указател� заедно � обекта �очен от него"
 
@@ -10437,186 +10647,186 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "празна пощен�ка кути� mbox: „%s“"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [ОПЦИЯ…] [ПОД�В��Е…]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "опци�та „-m“ изи�ква �тойно�т"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "��ма такава �тратеги� за �ливане: „%s“.\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "�аличните �тратегии �а:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните �тратегии �а:"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "без извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(�иноним на „--stat“)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "добав�не (на мак�имум такъв БРОЙ) запи�и от �ъкратени� журнал в �ъобщението "
 "за подаване"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "�ъздаване на едно подаване вме�то извършване на �ливане"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при у�пешно �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "редактиране на �ъобщението преди подаване"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "позвол�ване на превъртане (�тандартно дей�твие)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "преу�танов�ване, ако превъртането е невъзможно"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверка, че указаното подаване е � правилен подпи� на GPG"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "СТР�ТЕГИЯ"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "СТР�ТЕГИЯ за �ливане, ко�то да �е ползва"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "ОПЦИЯ=СТОЙ�ОСТ"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "ОПЦИЯ за избраната �тратеги� за �ливане"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "СЪОБЩЕ�ИЕ при подаването �ъ� �ливане (при �ъщин�ки �ливани�)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "преу�танов�ване на текущото �ливане"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "продължаване на текущото �ливане"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "позвол�ване на �ливане на незави�ими и�тории"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr ""
 "проверка на куката при пром�на на �ъобщението при подаване (commit-msg)"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "не може да �е извърши �катаване"
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "неу�пешно �катаване"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "неу�пешно прочитане на обект-дърво"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (н�ма какво да �е �мачка)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Подаване �ъ� �мачкване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "Лип�ва �ъобщение при подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s“ не �очи към подаване"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправилен низ за на�тройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа �е �амо �ливане на точно две и�тории."
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�епозната опци� за рекур�ивното �ливане „merge-recursive“: „-X%s“"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да �е чете"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Сливането н�ма да бъде подадено.  За завършването му и подаването му "
 "използвайте командата „git commit“.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10631,72 +10841,72 @@ msgstr ""
 "Редовете, които започват � „%c“ ще бъдат пропу�нати, а празно �ъобщение\n"
 "преу�танов�ва подаването.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "Празно �ъобщение при подаване."
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първи�т етап на �ливането завърши.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "�еу�пешно автоматично �ливане — коригирайте конфликтите и подайте "
 "резултата.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "��ма текущ клон."
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "Текущи�т клон не �леди никой клон."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�икой клон не �леди клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "�еправилна �тойно�т „%s“ в �редата „%s“"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не може да �е �лее в „%s“: %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "не може да �е �лее"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "опци�та „--abort“ не приема аргументи"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "�е може да преу�тановите �ливане, защото в момента не �е извършва такова "
 "(лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "опци�та „--continue“ не приема аргументи"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "В момента не �е извършва �ливане (лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10704,7 +10914,7 @@ msgstr ""
 "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува).\n"
 "Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10712,121 +10922,121 @@ msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува).  Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува)."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Опци�та „--squash“ е не�ъвме�тима � „--no-ff“."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "�е е указано подаване и на�тройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "Подаване �ъ� �мачкване във връх без и�тори� в�е още не �е поддържа"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Понеже върхът е без и�тори�, в�ички �ливани� �а превъртани�, не може да �е "
 "извърши �ъщин�ко �ливане изи�квано от опци�та „--no-ff“"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да �е �лее"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можете да �леете точно едно подаване във връх без и�тори�"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Подаването „%s“ е без подпи� от GPG."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "незави�ими и�тории не може да �е �ле�т"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "Вече е обновено."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обнов�ване „%s..%s“\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба �ъ� �ливане в рамките на индек�а…\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "�еу�пешно �ливане.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "Вече е обновено!"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "�е може да �е извърши превъртане, преу�танов�ване на дей�твието."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване �ъ� �тратеги�та за �ливане „%s“…\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�ико� �тратеги� за �ливане не може да извърши �ливането.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "�еу�пешно �ливане �ъ� �тратеги� „%s“.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 "Ползва �е �тратеги�та „%s“, ко�то ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10985,72 +11195,72 @@ msgstr "„%.*s“ вече е в индек�а"
 msgid "force move/rename even if target exists"
 msgstr "принудително преме�тване/преименуване дори целта да �ъще�твува"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "пре�качане на грешките при преме�тване/преименуване"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целта „%s“ �ъще�твува и не е директори�"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "неправилен обект"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "директори� не може да �е преме�ти в �ебе �и"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "директори� не може да �е преме�ти върху файл"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "първоначалната директори� е празна"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "не е под контрола на Git"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "целта �ъще�твува"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "презапи�ване на „%s“"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Презапи�ването е невъзможно"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "множе�тво източници за една цел"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "целевата директори� не �ъще�твува"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, обект: „%s“, цел: „%s“"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "неу�пешно преименуване на „%s“"
@@ -11244,12 +11454,12 @@ msgstr "обектът-бележка не може да бъде запи�ан
 msgid "the note contents have been left in %s"
 msgstr "�ъдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
@@ -11503,7 +11713,7 @@ msgstr "опитът за изтриването на не�ъще�твуващ
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от �тандартни� вход"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "�амо извеждане без дей�твително ока�тр�не"
 
@@ -11537,200 +11747,204 @@ msgstr ""
 "git pack-objects [ОПЦИЯ…] ПРЕФИКС_��_ИМЕТО [< СПИСЪК_С_УК�З�ТЕЛИ | < "
 "СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "грешка при декомпре�иране � „deflate“ (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, пакетите �а разделени поради "
 "�тойно�тта на „pack.packSizeLimit“"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "Запи�ване на обектите"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, защото н�кои обекти н�ма да �е "
 "пакетират"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "Компре�иране на обектите"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "неправилна �тойно�т за „--missing“"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдържана вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "неправилна вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "без извеждане на напредъка"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "извеждане на напредъка"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "извеждане на напредъка във фазата на запазване на обектите"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 "�ъщото дей�твие като опци�та „--all-progress“ при извеждането на напредъка"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "ВЕРСИЯ[,ОТМЕСТВ��Е]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "запазване на индек�а на пакетните файлове във форма̀та � указаната вер�и�"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "мак�имален размер на в�еки пакетен файл"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнориране на обектите заети от други хранилища на обекти"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "игнориране на пакетираните обекти"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "ограничаване на прозореца за пакетиране по брой обекти"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ограничаване на прозореца за пакетиране и по памет о�вен по брой обекти"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "мак�имална дължина на веригата от разлики, ко�то е позволена в пакетни� файл"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "преизползване на �ъще�твуващите разлики"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "преизползване на �ъще�твуващите обекти"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "използване на обекти „OFS_DELTA“"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "�тартиране на нишки за претър�ване на най-добрите �ъвпадени� на разликите"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "без �ъздаване на празен пакетен файл"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "изчитане на вер�иите от �тандартни� вход"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничаване до в�е още непакетираните обекти"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr ""
 "включване на в�ички обекти, които могат да �е до�тигнат от произволен "
 "указател"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "включване и на обектите �очени от запи�ите в журнала на указателите"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "включване и на обектите �очени от индек�а"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "извеждане на пакета на �тандартни� изход"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "включване и на обектите-етикети, които �очат към обектите, които ще бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "запазване на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "пакетиране и на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "разпакетиране на недо�тижимите обекти, които �а по-нови от това ВРЕМЕ"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "�ъздаване на �ъкратени пакети"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "пакетиране подход�що за плитко до�тав�не"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "игнориране на пакетите, които �а придружени от файл „.keep“"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "ниво на компре�иране при пакетиране"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr ""
 "извеждане на в�ички родители — дори и тези, които нормално �а �крити при "
 "при�аждани�та"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "използване на �ъще�твуващи индек�и на база битови ма�ки за у�кор�ване на "
 "пребро�ването на обектите"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 "запазване и на индек� на база побитова ма�ка, заедно � индек�а за пакета"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "как да �е обработват лип�ващите обекти"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "без пакетиране на обекти в гарантиращи пакети"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "Пребро�ване на обектите"
 
@@ -11758,15 +11972,19 @@ msgstr "Изтриване на повтар�щите �е обекти"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "информаци� за ока�трените обекти"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "ока�тр�не на обектите по-�тари от това ВРЕМЕ"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "хранилище � важни обекти не може да �е ока�тр�"
 
@@ -11867,7 +12085,7 @@ msgstr "За повече информаци� погледнете ръково
 msgid "<remote>"
 msgstr "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "КЛО�"
@@ -11892,27 +12110,27 @@ msgstr ""
 "За �ливане е указан отдалечени�т указател „%s“,\n"
 "но такъв не е до�тавен."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "без „--verify-signatures“ при пребазиране"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "опци�та „--[no-]autostash“ изи�ква „--rebase“"
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обнов�ване на в�е още не�ъздаден клон � промените от индек�а"
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "издърпване � пребазиране"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "тр�бва да подадете или �катаете промените."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11922,7 +12140,7 @@ msgstr ""
 "до�тав�нето обнови върха на текущи� клон.  Работното\n"
 "ви копие бе превърт�но от подаване „%s“."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11939,15 +12157,15 @@ msgstr ""
 "  $ git reset --hard\n"
 "за връщане към нормално �ъ�то�ние."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�е може да �ливате множе�тво клони в празен върхов указател."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "�е може да пребазирате върху повече от един клон."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "пребазирането е невъзможно заради локално запи�аните промени по подмодулите"
@@ -12348,41 +12566,45 @@ msgstr "git rebase--helper [ОПЦИЯ…]"
 msgid "keep empty commits"
 msgstr "запазване на празните подавани�"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "позвол�ване на празни �ъобщени� при подаване"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "продължаване на пребазирането"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "преу�танов�ване на пребазирането"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "�ъздаване на �крипт за пребазиране"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "�ъкратени идентификатори в �пи�ъка за изпълнение"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "пълни идентификатори в �пи�ъка за изпълнение"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "проверка на �пи�ъка за изпълнение"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "пре�качане на излишните команди за отбиране"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr ""
 "преподреждане на редовете за �ливане на подавани�та �ъ� и без �мени на "
 "�ъобщението"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "вмъкване на командите за изпълнение в �пи�ъка за изпълнение"
 
@@ -12390,7 +12612,7 @@ msgstr "вмъкване на командите за изпълнение в �
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ДИРЕКТОРИЯ_��_GIT"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12423,7 +12645,7 @@ msgstr ""
 "За да заглушите това �ъобщение, като запазите �тандартното поведение,\n"
 "задайте на�тройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12444,15 +12666,15 @@ msgstr ""
 "За да заглушите това �ъобщение, задайте на�тройката\n"
 "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Тр�бва да укажете директори�."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време"
@@ -12987,96 +13209,96 @@ msgstr ""
 "Ползвайте опци�та --no-write-bitmap-index или изключете на�тройката\n"
 "„pack.writebitmaps“."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "пакетиране на в�ичко в пакет"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 "�ъщото като опци�та „-a“.  Допълнително — недо�тижимите обекти да �танат "
 "непакетирани"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 "премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
 "prune-packed“"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "подаване на опци�та „--no-reuse-delta“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 "подаване на опци�та „--no-reuse-object“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "без изпълнение на командата „git-update-server-info“"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "подаване на опци�та „--local“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "�ъздаване и запи�ване на индек�и на база битови ма�ки"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "еври�тична дата"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "при комбинирането � опци�та „-A“ — без разпакетиране на обектите по �тари от "
 "това"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "� „-a“ — препакетиране на недо�тижимите обекти"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "размер на прозореца за делта компре�и�та"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "байтове"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "�ъщото като горната опци�, но ограничението да е по размер на паметта, а не "
 "по бро� на обектите"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "ограничаване на мак�ималната дълбочина на делтата"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "ограничаване на мак�имални� брой нишки"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "мак�имален размер на в�еки пакет"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "препакетиране на обектите в пакети бел�зани � „.keep“"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "пакетите в хранилище � важни обекти не може да �е три�т"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "Опциите „--keep-unreachable“ и „-A“ �а не�ъвме�тими"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "директори�та „%s“ не може да бъде изтрита"
@@ -13159,11 +13381,11 @@ msgstr "�м�на на родителите на подаване"
 msgid "replace the ref if it exists"
 msgstr "зам�на на указател�, ако �ъще�твува"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "без форматирано извеждане на �ъдържанието — за опци�та „--edit“"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "използване на този ФОРМ�Т"
 
@@ -13222,103 +13444,107 @@ msgstr "Дървото, �очено от указател� „HEAD“, не м
 msgid "Failed to find tree of %s."
 msgstr "Дървото, �очено от „%s“, не може да бъде открито."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "Указател�т „HEAD“ �очи към „%s“"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�е може да �е извърши %s занул�ване по време на �ливане."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "по-малко подробно�ти, да �е извеждат �амо грешките"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "индек�а и указател� „HEAD“, без работното дърво"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "�амо указател� „HEAD“, без индек�а и работното дърво"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "указател� „HEAD“, индек�а и работното дърво"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "занул�ване на указател� „HEAD“, но запазване на локалните промени"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "отбел�зване �амо на факта, че изтритите пътища ще бъдат добавени по-къ�но"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Стойно�тта „%s“ не е разпозната като �ъще�твуваща вер�и�."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "„%s“ не е разпознат като дърво."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 "опци�та „--patch“ е не�ъвме�тима � в��ка от опциите „--hard/--mixed/--soft“"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "опци�та „--mixed“ не бива да �е използва заедно � пътища.  Вме�то това "
 "изпълнете „git reset -- ПЪТ…“."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�е може да извършите %s занул�ване, когато �те задали ПЪТ."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "В голо хранилище не може да извършите %s занул�ване"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "Опци�та „-N“ е �ъвме�тима �амо � „--mixed“"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Промени извън индек�а �лед занул�ването:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Индек�ът не може да бъде занулен към вер�и� „%s“."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "�ови�т индек� не може да бъде запи�ан."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и �а не�ъвме�тими"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "филтрирането на обекти изи�ква опци�та „--objects“"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "неправилна ча�тична �тойно�т: %s"
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "опци�та „--use-bitmap-index“ е не�ъвме�тима � филтриране на обектите"
 
@@ -13422,10 +13648,6 @@ msgstr "добав�не на името на подаването"
 msgid "preserve initially empty commits"
 msgstr "запазване на първоначално празните подавани�"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "позвол�ване на празни �ъобщени� при подаване"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "запазване на излишните, празни подавани�"
@@ -13783,35 +14005,40 @@ msgstr "пропу�кане на в�ички редове, които запо
 msgid "prepend comment character and space to each line"
 msgstr "добав�не на „# “ в началото на в�еки ред"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "Такъв указател н�ма: %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Очаква �е пълно име на указател, а не „%s“"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+"командата „print-default-remote“ на „submodule--helper“ не приема аргументи"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не може да �е махне компонент от адре�а „%s“"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "директори� за определ�нето на отно�ителните пътища"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Във файла „.gitmodules“ не е открит адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13820,55 +14047,55 @@ msgstr ""
 "на�тройката „%s“ лип�ва.  Приема �е, че това хранилище е правилни�т източник "
 "за �ебе �и."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "�еу�пешно реги�триране на адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Реги�триран е подмодул „%s“ (%s) за път� към подмодул „%s“\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: препоръчва �е режим на обнов�ване за подмодула „%s“\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "�еу�пешно реги�триране на режима на обнов�ване за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "Без извеждане на информаци� при инициализирането на подмодул"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper name [ПЪТ]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Във файла „.gitmodules“ лип�ва информаци� за път� „%s“"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "указател�т �очен от „HEAD“ в подмодула „%s“ не може да бъде открит"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "неу�пешно рекур�ивно обхождане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr "Заглушаване на изхода за �ъ�то�нието на подмодула"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -13876,55 +14103,145 @@ msgstr ""
 "Използване на подаването указано в индек�а, а не това от указател� „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "рекур�ивно обхождане на подмодулите"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ПЪТ"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Синхронизиране на адре�а на подмодул за „%s“\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "неу�пешно реги�триране на адре� за път� към подмодул „%s“"
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "отдалечени�т адре� на подмодула „%s“ не може да бъде получен"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "отдалечени�т адре� на подмодула „%s“ не може да бъде променен"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Без извеждане на информаци� при �инхронизирането на подмодул"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Рекур�ивно обхождане на подмодулите"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"Работното дърво на подмодул „%s“ �ъдържа директори� „.git“.\n"
+"(ако и�кате да ги изтриете заедно � ц�лата им и�тори�, използвайте „rm -rf“)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Работното дърво на подмодул „%s“ �ъдържа локални промени.  Можете да ги "
+"отхвърлите � опци�та „-f“"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Директори�та „%s“ е изчи�тена\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+"Директори�та към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "празната директори� за подмодула „%s“ не може да бъде �ъздадена"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Реги�траци�та на подмодула „%s“ (%s) за път� „%s“ е премахната\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+"Изтриване на работните дървета на подмодулите, дори когато те �ъдържат "
+"локални промени"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "Премахване на реги�трациите на в�ички подмодули"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Използвайте „--all“, за да премахнете в�ички подмодули"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "към подмодула „%s“ не може да �е добави алтернативен източник: %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateErrorStrategy“"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateLocation“"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "къде да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "име на нови� подмодул"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "адре�, от който да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13932,85 +14249,85 @@ msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХР��ИЛИЩЕ] "
 "[--name ИМЕ] [--depth ДЪЛБОЧИ��] --url �ДРЕС --path ПЪТ…"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "директори�та на подмодула „%s“ не може да бъде получена"
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Път�т на подмодула „%s“ не е инициализиран"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Веро�тно и�кахте да използвате „update --init“?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пре�качане на не�лети� подмодул „%s“"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пре�качане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�еу�пешен опит за клониране на „%s“.  �а�рочен е втори опит"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Втори неу�пешен опит за клониране на „%s“.  Дей�твието �е преу�танов�ва"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "път към работното дърво"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "път към работното дърво, през границите на вложените подмодули"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr ""
 "„rebase“ (пребазиране), „merge“ (�ливане), „checkout“ (изтегл�не) или "
 "„none“ (нищо да не �е прави)"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Плитко клониране, отр�зано до указани� брой вер�ии"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "брой паралелни проце�и"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "дали първоначалното клониране да е плитко, както �е препоръчва"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "без извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "неправилен параметър към опци�та „--update“"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -14019,20 +14336,20 @@ msgstr ""
 "Клонът на подмодула „%s“ е на�троен да на�лед�ва клона от обхващащи� проект, "
 "но той не е на никой клон"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper name embed-git-dir [ПЪТ…]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "„%s“ не поддържа опци�та „--super-prefix“"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -14136,139 +14453,143 @@ msgstr "етикетът не може да бъде подпи�ан"
 msgid "unable to write tag file"
 msgstr "файлът за етикета не може да бъде запазен"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "неправилен вид обект."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "лип�ва �ъобщение за етикета"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Съобщението за етикета е запазено във файла „%s“\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "извеждане на имената на етикетите"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "извеждане на този БРОЙ редове от в��ко �ъобщение за етикет"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "изтриване на етикети"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "проверка на етикети"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Опции при �ъздаването на етикети"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "анотирането на етикети изи�ква �ъобщение"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "СЪОБЩЕ�ИЕ за етикет"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "принудително редактиране на �ъобщение за етикет"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "анотиран етикет � подпи� по GPG"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "използване на друг ключ за подпи�ването на етикет"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "зам�на на етикета, ако �ъще�твува"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "�ъздаване на журнал на указателите"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Опции за извеждането на етикети"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "извеждане на �пи�ъка на етикетите по колони"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "извеждане �амо на етикетите, които �ъдържат подаването"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "извеждане �амо на етикетите, които не �ъдържат подаването"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "извеждане �амо на �летите етикети"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "извеждане �амо на не�летите етикети"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "извеждане �амо на етикетите на ОБЕКТ�"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "Опциите „--column“ и „-n“ �а не�ъвме�тими"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "Опци�та „-n“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "Опци�та „-contains“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Опци�та „-contains“ изи�ква  режим на �пи�ък."
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "Опци�та „-points-at“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "Опциите „--merged“ и „--no-merged“ изи�кват режим на �пи�ък."
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "Опциите „-F“ и „-m“ �а не�ъвме�тими."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "Прекалено много аргументи"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече �ъще�твува"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "Разпакетиране на обектите"
 
@@ -14621,8 +14942,8 @@ msgid "print tag contents"
 msgstr "извеждане на �ъдържанието на ЕТИКЕТи"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [ОПЦИЯ…] ПЪТ [КЛО�]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УК�З�ТЕЛ_КЪМ_ПОД�В��Е]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14633,30 +14954,38 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move [ДЪРВО] [�ОВ_ПЪТ]"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [ОПЦИЯ…]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock [ПЪТ]"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректори�"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не �ъще�твува"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -14665,105 +14994,189 @@ msgstr ""
 "Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното "
 "(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Изтриване на „worktrees/%s“: файлът „gitdir“ �очи не�ъще�твуващо "
 "ме�тоположение"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "докладване на ока�трените работни дървета"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "об�в�ване на работните копи� по-�тари от това ВРЕМЕ за о�тарели"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s“ вече �ъще�твува"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Подготв�не на %s (идентификатор %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "Изтегл�не КЛО�а, дори и да е изтеглен в друго работно дърво"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "�ъздаване на нов клон"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "�ъздаване или занул�ване на клони"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "подготв�не на новото работно дърво"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "новото работно дърво да о�тане заключено"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "задаване на режима на �ледене (виж git-branch(1))"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "опит за напа�ване на името на нови� клон � това на �лед�щ клон"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "Опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "„--[no-]track“ може да �е използва �амо при �ъздаването на нов клон"
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "причина за заключване"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "„%s“ не е работно дърво"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "О�новното дърво не може да �е отключи или заключи"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s“ вече е заключено, защото „%s“"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s“ вече е заключено"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s“ не е заключено"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"не може да ме�тите или изтривате работни дървета, в които има подмодули"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "„%s“ е о�новно работно дърво"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "името на целта не може да �е определи от „%s“"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "целта „%s“ вече �ъще�твува"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr ""
+"не може да преме�тите заключено работно дърво, причина за заключването: %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "не може да ме�тите заключено работно дърво"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+"проверките �а неу�пешни, работното дърво не може да бъде преме�тено: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "„%s“ не може да �е преме�ти в „%s“"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "не може да изпълни „git status“ върху „%s“"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+"работното дърво „%s“ не е чи�то, за принудително изтриване е необходима "
+"опци�та „--force“ "
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+"командата „git status“ не може да �е изпълни за „%s“, код за грешка: %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "неу�пешно изтриване на „%s“"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "принудително изтриване, дори работното дърво да не е чи�то"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr ""
+"не може да изтриете заключено работно дърво, причина за заключването: %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "не може да изтриете заключено работно дърво"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "проверките �а неу�пешни, работното дърво не може да бъде изтрито: %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]"
@@ -14780,24 +15193,24 @@ msgstr "запиÑ� на обект-дърво за поддиректориÑ�Ñ‚Ð
 msgid "only useful for debugging"
 msgstr "�амо за изчи�тване на грешки"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "изход �лед първоначалната разм�на на за�вка и отговор"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "изход �лед първоначалната об�ва на указатели"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "да не �е тър�и „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "тран�ферът да �е преу�танови �лед този БРОЙ �екунди"
 
@@ -14820,6 +15233,20 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "извеждане на �ъобщени�та за тра�иране на �тандартната грешка"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C ПЪТ] [-c ИМЕ=СТОЙ�ОСТ]\n"
+"           [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n"
+"           КОМ��Д� [�РГ…]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14835,21 +15262,67 @@ msgstr ""
 "Българ�ки превод на книгата „Pro Git“ от Чакън и Страуб:\n"
 "http://i-can.eu/progit2-bg/progit.html"
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "опци�та „--git-dir“ изи�ква директори�\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "опци�та „--namespace“ изи�ква име\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "опци�та „--work-tree“ изи�ква директори�\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "опци�та „--super-prefix“ изи�ква префик�\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "опци�та „-c“ изи�ква низ за на�тройка\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "опци�та „-C“ изи�ква директори�\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "непозната опци�: „%s“\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+"неу�пешно заме�тване на �инонима „%s“ — резултатът „%s“ не е команда на git\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "командата „%s“ не може да �е изпълни: %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 "отрицателна �тойно�т за „http.postbuffer“.  Ще �е ползва �тандартната: %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Управлението на делегирането не �е поддържа от cURL < 7.22.0"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Задаването на по�то�нен публичен ключ не �е поддържа от cURL < 7.44.0"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14860,16 +15333,16 @@ msgstr ""
 "    � за�вен адре�: %s\n"
 "    � прена�очване: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "прена�очване към „%s“"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "�РГУМЕ�ТИ"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "филтриране по вид на обекта"
 
@@ -14978,23 +15451,23 @@ msgstr "Извеждане на Ñ�ÑŠÑ�тоÑ�нието на работното Ð
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Извеждане, �ъздаване, изтриване, проверка на етикети подпи�ани � GPG"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "период на валидно�т/запазване"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "нулева операци� (за �ъвме�тимо�т � предишни вер�ии)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "повече подробно�ти"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "по-малко подробно�ти"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "да �е показват такъв БРОЙ цифри от �умите по SHA1"
 
@@ -15235,7 +15708,7 @@ msgstr "Опит за про�то �ливане � „$pretty_name“"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Про�тото �ливане не �работи, пробва �е автоматично �ливане."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15249,44 +15722,44 @@ msgstr ""
 "За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
 "изпълнете „git rebase --abort“."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Връщането към „${head_name}“ е невъзможно"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "�втоматично �катаното е приложено."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "„${stash_sha1}“ не може да бъде запазен"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 "Изглежда, че �ега �е прилагат кръпки чрез командата „git-am“.  �е може да "
 "пребазирате в момента."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Опци�та „--edit-todo“ е до�тъпна �амо по време на интерактивно пребазиране."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде прочетен"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -15294,7 +15767,7 @@ msgstr ""
 "Тр�бва да редактирате в�ички конфликти при �ливането.  След това\n"
 "отбележете коригирането им чрез командата „git add“"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -15315,79 +15788,79 @@ msgstr ""
 "за\n"
 "да не загубите �лучайно промени."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "неправилна о�нова за �равнение „${upstream_name}“"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 "указател�т „${onto_name}“ може да �очи към повече от една о�нова за "
 "пребазирането"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "указател�т „${onto_name}“ не �очи към никаква о�нова за пребазирането"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Указател�т „${onto_name}“ не �очи към подаване"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "Ф�Т�Л�� ГРЕШК�: не �ъще�твува клон „${branch_name}“"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "�е може да �е �катае автоматично"
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�втоматично �катано: „${stash_abbrev}“"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "Промените тр�бва или да �е подадат, или да �е �ката�т."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "Указател�т „HEAD“ е напълно актуален"
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Текущи�т клон „${branch_name}“ е напълно актуален."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "Указател�т „HEAD“ е напълно актуален.  Пребазирането е принудително."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 "Текущи�т клон „${branch_name}“ е напълно актуален.  Пребазирането е "
 "принудително."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Промените от „${mb}“ към „${onto}“:"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Първо, указател�т „HEAD“ започва да �очи към базата, върху ко�то пребазирате…"
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“."
@@ -15457,88 +15930,88 @@ msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 "Съ�то�нието на работната директори� и индек�а �а запазени: „$stash_msg“"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "Промените в работното дърво не могат да бъдат занулени"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "непозната опци�: ${opt}"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "�е е открито нищо �катано."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Указани �а прекалено много вер�ии: „${REV}“"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "Указател�т „${reference}“ е грешен"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "„${args}“ не е подаване, приличащо на нещо �катано"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "„${args}“ не е указател към нещо �катано"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "индек�ът не може да бъде обновен"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "По време на �ливане не може да приложите нещо �катано"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 "В индек�а има конфликти.  Пробвайте да изпълните командата без опци�та „--"
 "index“."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "Дървото �очено от индек�а не може да бъде запазено"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "�е�ледени файлове не могат да �е въз�танов�т от �катаното"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "Променените файлове не могат да бъдат извадени от индек�а"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "Индек�ът не е �катан."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr "Скатаното е запазено в �лучай, че ви потр�бва отново"
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Изтрито е �катаното „${REV}“ ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "Скатаното „${REV}“ не може да бъде изтрито"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "�е е указано име на клон"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(За да ги въз�тановите, изпълнете командата „git stash apply“)"
 
@@ -15641,70 +16114,17 @@ msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 "Спиране при „${displaypath}“ — изходни�т код от �крипта бе различен от 0."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "указването на път е не�ъвме�тимо � опци�та „--all“"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Използвайте „--all“, за да премахнете в�ички подмодули"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"Работното дърво на подмодул „${displaypath}“ �ъдържа директори� „.git“.\n"
-"(ако и�кате да ги изтриете заедно � ц�лата им и�тори�, използвайте „rm -rf“)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"Работното дърво на подмодул „${displaypath}“ �ъдържа локални промени.  "
-"Можете да го отхвърлите � опци�та „-f“"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Директори�та „${displaypath}“ е изчи�тена"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-"Директори�та към работното дърво на подмодула „${displaypath}“ не може да "
-"бъде изтрита"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-"Празната директори� за подмодула „${displaypath}“ не може да бъде �ъздадена"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"Премахната е реги�траци�та на подмодул „${name}“, �очещ към адре� „${url}“, "
-"за път� „${displaypath}“"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Текущата вер�и� за подмодула в „${displaypath}“ лип�ва"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15713,12 +16133,12 @@ msgstr ""
 "Текущата вер�и� „${remote_name}/${branch}“ в път� към подмодул „${sm_path}“ "
 "лип�ва"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15727,91 +16147,86 @@ msgstr ""
 "Подмодулът в път� „$displaypath“ е до�тавен, но не �ъдържа обекта �ъ� �ума\n"
 "„$sha1“.  Директното до�тав�не на това подаване е неу�пешно."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изтегл�не на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: изтеглена е вер�и� „${sha1}“"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно пребазиране на вер�и� „${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: пребазиране върху вер�и� „${sha1}“"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно �ливане на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: �ливане � вер�и� „${sha1}“"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изпълнение на командата „${command} ${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Опциите „--cached“ и „--files“ �а не�ъвме�тими"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "неочакван режим „${mod_dst}“"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_src}“"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_dst}“"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа никое от подавани�та "
 "„${sha1_src}“ и „${sha1_dst}“"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Синхронизиране на адре�а за път� към подмодул „${displaypath}“"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15867,7 +16282,7 @@ msgstr ""
 "\n"
 "�ко изтриете ред, �ъответ�тващото му подаване ще бъде ИЗТРИТО.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15886,84 +16301,84 @@ msgstr ""
 "\n"
 "    git rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: това не е подаване, което може да бъде отбрано"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "�еправилно име на подаване: „$sha1“"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 "Заме�тващата �ума по SHA1 за текущото подаване не може да бъде запазена"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Превъртане до „$sha1“"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "�е може да �е превърти до „$sha1“"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Указател�т „HEAD“ не може да �е на�очи към „$first_parent“"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Подаването не може да �е �мачка: „$sha1“"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Грешка при повтар�нето на �ливането на „$sha1“"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "„$sha1“ не може да �е отбере."
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Това е �ъобщение при подаване №${n}:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Съобщение при подаване №${n} ще бъде пре�кочено."
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Това е обединение от $count подаване."
 msgstr[1] "Това е обединение от $count подавани�."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�овото �ъобщение при подаване „$fixup_msg“ не може да бъде запазено"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "Това е обединение от 2 подавани�"
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "�е може да �е подаде $sha1… $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15979,31 +16394,31 @@ msgstr ""
 "коригирате,\n"
 "преди да можете да промените подаването."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Спиране при „$sha1_abbrev…“ $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „$squash_style“"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "В момента �е изпълн�ва: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "�еу�пешно изпълнение: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "и промени индек�а и/или работното дърво"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -16014,7 +16429,7 @@ msgstr ""
 "    git rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -16029,29 +16444,29 @@ msgstr ""
 "\n"
 "    git rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "�епозната команда: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Коригирайте това чрез „git rebase --edit-todo“."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "У�пешно пребазиране и обнов�ване на „$head_name“."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "указател�т „HEAD“ не може да �е отдели"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -16081,11 +16496,11 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr "�е може да бъде открит автор за поправ�нето на подаването"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -16093,11 +16508,11 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "Промените в индек�а не могат да бъдат подадени."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -16112,37 +16527,37 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "Тек�тови�т редактор не може да бъде �тартиран"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "„$switch_to“ не може да �е изтегли"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "Лип�ва указател „HEAD“"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Временната директори� „$state_dir“ не може да бъде �ъздадена"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "Пребазирането не е интерактивно"
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "Спи�ъкът � презапи�аните подавани� не може да бъде �ъздаден"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "Файлът � командите не може да �е генерира"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -16151,7 +16566,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -16161,7 +16576,7 @@ msgstr ""
 "�ко изтриете в�ичко, пребазирането ще бъде преу�тановено.\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Празните подавани� �а коментирани"
 
@@ -16307,7 +16722,7 @@ msgstr "Добав�не на не�ледени"
 msgid "No untracked files.\n"
 msgstr "��ма не�ледени файлове.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -16316,7 +16731,7 @@ msgstr ""
 "незабавно\n"
 "добавено към индек�а"
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -16325,7 +16740,7 @@ msgstr ""
 "незабавно\n"
 "�кътано"
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -16334,7 +16749,7 @@ msgstr ""
 "незабавно\n"
 "извадено от индек�а."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -16343,7 +16758,7 @@ msgstr ""
 "незабавно\n"
 "набел�зано за прилагане."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -16352,16 +16767,16 @@ msgstr ""
 "незабавно\n"
 "набел�зано за занул�ване."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Ръчно редактиране на парчета код — отдолу има под�казка.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -16376,7 +16791,7 @@ msgstr ""
 "Редовете, които започват � „%s“ ще бъдат пропу�нати.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -16386,7 +16801,7 @@ msgstr ""
 "изтриете в�ички редове от парчето код, то ще бъде о�тавено непроменено, а\n"
 "редактирането — отказано.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
@@ -16398,7 +16813,7 @@ msgstr ""
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -16406,7 +16821,7 @@ msgstr ""
 "редактирането? (текущите редакции ще �е отмен�т при отказ!): „y“ (да)/ "
 "„n“ (не)? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -16420,7 +16835,7 @@ msgstr ""
 "a — добав�не на това и в�ички �ледващи парчета от файла в индек�а\n"
 "d — без добав�не на това и в�ички �ледващи парчета от файла в индек�а"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -16434,7 +16849,7 @@ msgstr ""
 "a — �катаване на това и в�ички �ледващи парчета от файла\n"
 "d — без �катаване на това и в�ички �ледващи парчета от файла"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -16448,7 +16863,7 @@ msgstr ""
 "a — изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
 "d — без изваждане на това и в�ички �ледващи парчета от файла от индек�а"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -16462,7 +16877,7 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла към индек�а"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -16479,7 +16894,7 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от работното "
 "дърво"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16496,7 +16911,7 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16513,7 +16928,7 @@ msgstr ""
 "d — без прилагане на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16535,204 +16950,220 @@ msgstr ""
 "e — ръчно редактиране на текущото парче\n"
 "? — извеждане не помощта\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Избраните парчета не могат да �е добав�т в индек�а!\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "Да �е приложат ли към работното дърво? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "�ищо не е приложено.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "пренебрегване на не�л�тото: „%s“\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Само двоични файлове �а променени.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "��ма промени.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Обнов�ване на кръпка"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Добав�не на пром�ната на правата за до�тъп [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Добав�не на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Добав�не на изтриването [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Добав�не на изтриването [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Добав�не на това парче [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Добав�не на това парче [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Скатаване на пром�ната на правата за до�тъп [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Скатаване на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Скатаване на изтриването [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Скатаване на това парче [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Изваждане на пром�ната на правата за до�тъп [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Изваждане на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Изваждане на изтриването [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Изваждане на това парче [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
-"Прилагане на пром�ната на правата за до�тъп към индек�а [y,n,q,a,d,/%s,?]? "
+"Прилагане на пром�ната на правата за до�тъп към индек�а [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Прилагане на изтриването към индек�а [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на изтриването към индек�а [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Прилагане на това парче към индек�а [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на това парче към индек�а [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Премахване на пром�ната в правата за до�тъп от работното дърво [y,n,q,a,d,/"
+"Премахване на пром�ната в правата за до�тъп от работното дърво [y,n,q,a,d"
 "%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Премахване на парчето от работното дърво [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на пром�ната в правата за до�тъп от индек�а и работното дърво [y,"
-"n,q,a,d,/%s,?]? "
+"n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Премахване на изтриването от индек�а и работното дърво [y,n,q,a,d,/%s,?]? "
+"Премахване на изтриването от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Премахване на парчето от индек�а и работното дърво [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Премахване на парчето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на пром�ната в правата за до�тъп от индек�а и работното дърво [y,n,"
-"q,a,d,/%s,?]? "
+"q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Прилагане на изтриването от индек�а и работното дърво [y,n,q,a,d,/%s,?]? "
+"Прилагане на изтриването от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Прилагане на парчето от индек�а и работното дърво [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на парчето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "��ма други парчета\n"
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "към кое парче да �е придвижи (за повече варианти нати�нете „enter“)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "към кое парче да �е придвижи? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "�еправилен номер: „%s“\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Има �амо %d парче.\n"
 msgstr[1] "Има �амо %d парчета.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "��ма други парчета за тър�ене\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "да �е тър�и � регул�рен израз? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Сгрешен регул�рен израз „%s“: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "�икое парче не напа�ва на регул�рни� израз\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "��ма друго парче преди това\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "��ма друго парче �лед това\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Това парче не може да бъде разделено\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Раздел�не на %d парче.\n"
 msgstr[1] "Раздел�не на %d парчета.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Това парче не може да бъде редактирано\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Преглед на разликата"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16753,90 +17184,98 @@ msgstr ""
 "                и индек�а\n"
 "add untracked — добав�не на не�ледените файлове към промените в индек�а\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "„--“ лип�ва"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизве�тна �тратеги� за прилагане на кръпка: „%s“"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "указан е неправилен аргумент „%s“, а �е очаква „--“."
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "разликата между ме�тни� ча�ови по�� и GMT �ъдържа дробна ча�т от минута\n"
 "\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "разликата между ме�тни� ча�ови� по�� и GMT е 24 ча�а или повече\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 "тек�тови�т редактор приключи работата � грешка, в�ичко �е преу�танов�ва"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "„%s“ �ъдържа временна вер�и� на подготв�ното е-пи�мо.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final“ �ъдържа подготвеното е-пи�мо.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "опци�та „--dump-aliases“ е не�ъвме�тима � другите опции\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Командата „git format-patch“ не може да �е изпълни извън хранилище\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"„batch-size“ и „relogin“ тр�бва да �е указват заедно (или чрез командни� "
+"ред, или чрез на�тройките)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�епознато поле за опци�та „--suppress-cc“: „%s“\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�епозната �тойно�т за „--confirm“: %s\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: �иноними за sendmail �ъдържащи кавички („\"“) не �е "
 "поддържат: %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: „:include:“ не �е поддържа: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: прена�очвани� „/file“ или „|pipe“ не �е поддържат: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: редът за „sendmail“ не е разпознат: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16851,12 +17290,12 @@ msgstr ""
 "    � укажете „./%s“ за файл;\n"
 "    � използвате опци�та „--format-patch“ за диапазон.\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Директори�та „%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16865,7 +17304,7 @@ msgstr ""
 "Ф�Т�Л�� ГРЕШК�: %s: %s\n"
 "ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16875,17 +17314,17 @@ msgstr ""
 "�е �а указани кръпки!\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "В „%s“ лип�ва тема"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "„%s“ не може да �е отвори за запи�: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16900,32 +17339,27 @@ msgstr ""
 "\n"
 "Изтрийте в�ичко, ако не и�кате да изпратите обобщаващо пи�мо.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "„%s.final“ не може да �е отвори: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr ""
-"Полетата „To“/„Cc“/„Bcc“ в�е още не �е интерпретират.  Те б�ха пре�кочени\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "„%s.final“ не може да �е отвори: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "Обобщаващото пи�мо е празно и �е пре�кача\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Сигурни ли �те, че и�кате да ползвате „%s“ [y/N]? "
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16933,11 +17367,11 @@ msgstr ""
 "Следните файлове �а 8 битови, но не �а � об�вена заглавна ча�т „Content-"
 "Transfer-Encoding“.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Кое 8 битово кодиране �е ползва [�тандартно: UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16950,22 +17384,22 @@ msgstr ""
 "в�е още е � шаблонното заглавие „*** SUBJECT HERE ***“.  Ползвайте опци�та\n"
 "„--force“, ако �те �игурни, че точно това и�кате да изпратите.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "�а кой да �е прат�т е-пи�мата (незадължително поле)"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ е �иноним на �ебе �и\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Идентификатор на �ъобщение „Message-ID“, което да �е използва за об�в�ването "
 "на отговор „In-Reply-To“ (незадължително поле)"
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ГРЕШК�: не може да �е извлече адре� от „%s“\n"
@@ -16973,18 +17407,18 @@ msgstr "ГРЕШК�: не може да �е извлече адре� от „
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Какво да �е направи � този адре�? „q“ (�пиране), „d“ (изтриване), "
 "„e“ (редактиране): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Път�т към �ертификат „%s“ не �ъще�твува."
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -17012,131 +17446,131 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr ""
 "Изпращане на е-пи�мото? „y“ (да), „n“ (не), „q“ (изход), „a“ (в�ичко): "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Изи�кване на отговор към това е-пи�мо"
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "Сървърът за SMTP не е на�троен правилно."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сървърът не поддържа „STARTTLS“! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "�еу�пешно изпълнение на STARTTLS! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Под�и�темата за SMTP не може да �е инициализира.  Проверете на�тройките и "
 "използвайте опци�та: „--smtp-debug“."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "„%s“ не може да бъде изпратен\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Проба за изпращане на „%s“\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Изпращане на „%s“\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "У�пех при пробата.  От журнала:\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "У�пех.  От журнала:\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "Резултат: "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Резултат: у�пех\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „до: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(не-mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(т�ло) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е може да бъде �е изпълни „%s“"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добав�не на „%s: %s“ от: „%s“\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) програмни�т канал не може да �е затвори за изпълнението на „%s“"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "�ъобщението не може да �е изпрати чрез 7 битови знаци"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "неправилно кодиране за прено�"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "„%s“ не може да �е отвори: %s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "„%s“: кръпката �ъдържа ред � над 988 знака"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "„%s“ �е пропу�ка, защото е � разширение за архивен файл: „%s“.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "�аи�тина ли и�кате да изпратите „%s“? [y|N]: "
diff --git a/po/ca.po b/po/ca.po
index 874ad3c..6bba189 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
 # Catalan translations for Git.
 # This file is distributed under the same license as the Git package.
 # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
-# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2017
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2018
 #
 # Terminologia i criteris utilitzats
 #
@@ -47,8 +47,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-10-17 09:44+0800\n"
-"PO-Revision-Date: 2017-10-15 22:15+0200\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-18 15:48+0100\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -58,37 +58,37 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.4\n"
 
-#: advice.c:58
+#: advice.c:62
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "pista: %.*s\n"
 
-#: advice.c:86
+#: advice.c:90
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:88
+#: advice.c:92
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:90
+#: advice.c:94
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:92
+#: advice.c:96
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:94
+#: advice.c:98
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:96
+#: advice.c:100
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No és possible %s perquè teniu fitxers sense fusionar."
 
-#: advice.c:104
+#: advice.c:108
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -97,23 +97,23 @@ msgstr ""
 "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
 "resolució i feu una comissió."
 
-#: advice.c:112
+#: advice.c:116
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:117 builtin/merge.c:1211
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
 
-#: advice.c:119
+#: advice.c:123
 msgid "Please, commit your changes before merging."
 msgstr "Cometeu els vostres canvis abans de fusionar."
 
-#: advice.c:120
+#: advice.c:124
 msgid "Exiting because of unfinished merge."
 msgstr "S'està sortint a causa d'una fusió no terminada."
 
-#: advice.c:126
+#: advice.c:130
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -150,176 +150,173 @@ msgstr "opció d'espai en blanc «%s» no reconeguda"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
 
-#: apply.c:125
+#: apply.c:122
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject i --3way no es poden usar junts."
 
-#: apply.c:127
+#: apply.c:124
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached i --3way no es poden usar junts."
 
-#: apply.c:130
+#: apply.c:127
 msgid "--3way outside a repository"
 msgstr "--3way fora d'un dipòsit"
 
-#: apply.c:141
+#: apply.c:138
 msgid "--index outside a repository"
 msgstr "--index fora d'un dipòsit"
 
-#: apply.c:144
+#: apply.c:141
 msgid "--cached outside a repository"
 msgstr "--cached fora d'un dipòsit"
 
-#: apply.c:845
+#: apply.c:821
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No es pot preparar l'expressió regular de marca de temps %s"
 
-#: apply.c:854
+#: apply.c:830
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec ha retornat %d per l'entrada: %s"
 
-#: apply.c:928
+#: apply.c:904
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
 
-#: apply.c:966
+#: apply.c:942
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la línia %d"
 
-#: apply.c:972
+#: apply.c:948
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr ""
-"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia %d"
+msgstr "git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia %d"
 
-#: apply.c:973
+#: apply.c:949
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr ""
-"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la línia %d"
+msgstr "git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la línia %d"
 
-#: apply.c:978
+#: apply.c:954
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
 
-#: apply.c:1007
+#: apply.c:983
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode no vàlid en la línia %d: %s"
 
-#: apply.c:1325
+#: apply.c:1301
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "línies de capçalera %d i %d inconsistents"
 
-#: apply.c:1497
+#: apply.c:1473
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recompte: línia inesperada: %.*s"
 
-#: apply.c:1566
+#: apply.c:1542
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
 
-#: apply.c:1586
+#: apply.c:1562
 #, c-format
 msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
+"git diff header lacks filename information when removing %d leading pathname component "
+"(line %d)"
 msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
+"git diff header lacks filename information when removing %d leading pathname components "
+"(line %d)"
 msgstr[0] ""
-"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
-"%d component de nom de camí inicial (línia %d)"
+"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d component "
+"de nom de camí inicial (línia %d)"
 msgstr[1] ""
-"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
-"%d components de nom de camí inicial (línia %d)"
+"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d "
+"components de nom de camí inicial (línia %d)"
 
-#: apply.c:1599
+#: apply.c:1575
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
-msgstr ""
-"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
+msgstr "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
 
-#: apply.c:1787
+#: apply.c:1763
 msgid "new file depends on old contents"
 msgstr "el fitxer nou depèn dels continguts antics"
 
-#: apply.c:1789
+#: apply.c:1765
 msgid "deleted file still has contents"
 msgstr "el fitxer suprimit encara té continguts"
 
-#: apply.c:1823
+#: apply.c:1799
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "pedaç malmès a la línia %d"
 
-#: apply.c:1860
+#: apply.c:1836
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "el fitxer nou %s depèn dels continguts antics"
 
-#: apply.c:1862
+#: apply.c:1838
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el fitxer suprimit %s encara té continguts"
 
-#: apply.c:1865
+#: apply.c:1841
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
 
-#: apply.c:2012
+#: apply.c:1988
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "pedaç binari malmès a la línia %d: %.*s"
 
-#: apply.c:2049
+#: apply.c:2025
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "pedaç binari no reconegut a la línia %d"
 
-#: apply.c:2209
+#: apply.c:2185
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "pedaç amb només escombraries a la línia %d"
 
-#: apply.c:2295
+#: apply.c:2271
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: apply.c:2299
+#: apply.c:2275
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2958
+#: apply.c:2934
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de línia no vàlid: '%c'"
 
-#: apply.c:3077
+#: apply.c:3055
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
 msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
 
-#: apply.c:3089
+#: apply.c:3067
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
 
-#: apply.c:3095
+#: apply.c:3073
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -328,452 +325,438 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3117
+#: apply.c:3095
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "manquen les dades de pedaç binari de «%s»"
 
-#: apply.c:3125
+#: apply.c:3103
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
 
-#: apply.c:3171
+#: apply.c:3149
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
-"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
+msgstr "no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
 
-#: apply.c:3181
+#: apply.c:3159
 #, c-format
-msgid ""
-"the patch applies to '%s' (%s), which does not match the current contents."
-msgstr ""
-"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
-"actuals."
+msgid "the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts actuals."
 
-#: apply.c:3189
+#: apply.c:3167
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
 
-#: apply.c:3207
+#: apply.c:3185
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
 
-#: apply.c:3220
+#: apply.c:3198
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el pedaç binari no s'aplica a «%s»"
 
-#: apply.c:3226
+#: apply.c:3204
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
-"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha rebut %s)"
+msgstr "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha rebut %s)"
 
-#: apply.c:3247
+#: apply.c:3225
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaç ha fallat: %s:%ld"
 
-#: apply.c:3369
+#: apply.c:3347
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "s'ha produït un error en llegir %s"
 
-#: apply.c:3426
+#: apply.c:3404
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
 
-#: apply.c:3455 apply.c:3695
+#: apply.c:3433 apply.c:3673
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3538 apply.c:3709
+#: apply.c:3516 apply.c:3687
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3547 apply.c:3717
+#: apply.c:3525 apply.c:3695
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'índex"
 
-#: apply.c:3582
+#: apply.c:3560
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
+msgstr "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
 
-#: apply.c:3585
+#: apply.c:3563
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "S'està retrocedint a una fusió de 3 vies...\n"
 
-#: apply.c:3601 apply.c:3605
+#: apply.c:3579 apply.c:3583
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no es poden llegir els continguts actuals de «%s»"
 
-#: apply.c:3617
+#: apply.c:3595
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
 
-#: apply.c:3631
+#: apply.c:3609
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
 
-#: apply.c:3636
+#: apply.c:3614
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 
-#: apply.c:3662
+#: apply.c:3640
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3734
+#: apply.c:3712
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3736
+#: apply.c:3714
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3886 apply.c:3888
+#: apply.c:3864 apply.c:3866
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camí no vàlid: «%s»"
 
-#: apply.c:3944
+#: apply.c:3922
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3947
+#: apply.c:3925
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3967
+#: apply.c:3945
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
 
-#: apply.c:3972
+#: apply.c:3950
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
 
-#: apply.c:3992
+#: apply.c:3970
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
 
-#: apply.c:3996
+#: apply.c:3974
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:4011
+#: apply.c:3989
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4102
+#: apply.c:4080
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta la informació sha1 o és inútil per al submòdul %s"
 
-#: apply.c:4109
+#: apply.c:4087
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "canvi de mode per a %s, el qual no està en el HEAD actual"
 
-#: apply.c:4112
+#: apply.c:4090
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry ha fallat per al camí «%s»"
 
-#: apply.c:4121
+#: apply.c:4099
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'índex temporal"
 
-#: apply.c:4131
+#: apply.c:4109
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'índex temporal a %s"
 
-#: apply.c:4269
+#: apply.c:4247
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4304
+#: apply.c:4282
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4310
+#: apply.c:4288
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
 
-#: apply.c:4318
+#: apply.c:4296
 #, c-format
 msgid "unable to create backing store for newly created file %s"
-msgstr ""
-"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
-"%s"
+msgstr "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat %s"
 
-#: apply.c:4324 apply.c:4468
+#: apply.c:4302 apply.c:4446
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no s'ha pogut afegir una entrada de cau per a %s"
 
-#: apply.c:4365
+#: apply.c:4343
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "no s'ha pogut escriure a «%s»"
 
-#: apply.c:4369
+#: apply.c:4347
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'està tancant el fitxer «%s»"
 
-#: apply.c:4439
+#: apply.c:4417
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
 
-#: apply.c:4537
+#: apply.c:4515
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4545
+#: apply.c:4523
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4548
+#: apply.c:4526
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
 msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
 
-#: apply.c:4559
+#: apply.c:4537
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4581
+#: apply.c:4559
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4585
+#: apply.c:4563
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4695
+#: apply.c:4673
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omès el pedaç «%s»."
 
-#: apply.c:4703
+#: apply.c:4681
 msgid "unrecognized input"
 msgstr "entrada no reconeguda"
 
-#: apply.c:4722
+#: apply.c:4700
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4859
+#: apply.c:4837
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaç «%s»: %s"
 
-#: apply.c:4886
+#: apply.c:4864
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "s'ha silenciat %d error d'espai en blanc"
 msgstr[1] "s'han silenciat %d errors d'espai en blanc"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4870 apply.c:4885
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línia afegeix errors d'espai en blanc."
 msgstr[1] "%d línies afegeixen errors d'espai en blanc."
 
-#: apply.c:4900
+#: apply.c:4878
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] ""
-"S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc."
-msgstr[1] ""
-"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
+msgstr[0] "S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc."
+msgstr[1] "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "No s'ha pogut escriure un fitxer d'índex nou"
 
-#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
-#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
-#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
-#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
-#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
-#: git-add--interactive.perl:197
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 builtin/clone.c:118
+#: builtin/fetch.c:127 builtin/pull.c:193 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:1197 builtin/submodule--helper.c:1200
+#: builtin/submodule--helper.c:1567 builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1787 git-add--interactive.perl:197
 msgid "path"
 msgstr "camí"
 
-#: apply.c:4948
+#: apply.c:4922
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4951
+#: apply.c:4925
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4953 builtin/am.c:2265
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "número"
 
-#: apply.c:4954
+#: apply.c:4928
 msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-"elimina <nombre> barres obliqües inicials dels camins de diferència "
-"tradicionals"
+msgstr "elimina <nombre> barres obliqües inicials dels camins de diferència tradicionals"
 
-#: apply.c:4957
+#: apply.c:4931
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:4959
+#: apply.c:4933
 msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
-"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
+msgstr "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
 
-#: apply.c:4963
+#: apply.c:4937
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
 
-#: apply.c:4965
+#: apply.c:4939
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
 
-#: apply.c:4967
+#: apply.c:4941
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
 
-#: apply.c:4969
+#: apply.c:4943
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
 
-#: apply.c:4971
+#: apply.c:4945
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:4973
+#: apply.c:4947
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
 
-#: apply.c:4975
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
 
-#: apply.c:4977
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
 
-#: apply.c:4979
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
 
-#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el caràcter NUL"
 
-#: apply.c:4984
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> línies de context coincideixin"
 
-#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "acció"
 
-#: apply.c:4986
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
-"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
+msgstr "detecta les línies noves o modificades que tinguin errors d'espai en blanc"
 
-#: apply.c:4989 apply.c:4992
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:4995
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:4997
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:4999
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:5001
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "permet trossos encavalcants"
 
-#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
-#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 builtin/commit.c:1276
+#: builtin/count-objects.c:96 builtin/fsck.c:665 builtin/log.c:1901 builtin/mv.c:123
+#: builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "sigues detallat"
 
-#: apply.c:5004
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
 
-#: apply.c:5007
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
 
-#: apply.c:5009 builtin/am.c:2253
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:5010
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
@@ -786,17 +769,14 @@ msgid "git archive --list"
 msgstr "git archive --list"
 
 #: archive.c:15
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
-"[<camí>...]"
+msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> [<camí>...]"
 
 #: archive.c:16
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
 
-#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
@@ -809,7 +789,7 @@ msgstr "format"
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:437 builtin/log.c:1452
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "prefix"
 
@@ -817,11 +797,10 @@ msgstr "prefix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
-#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
-#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 parse-options.h:165
 msgid "file"
 msgstr "fitxer"
 
@@ -853,8 +832,8 @@ msgstr "comprimeix millor"
 msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "dipòsit"
 
@@ -905,22 +884,22 @@ msgstr ""
 "Els patrons negatius s'ignoren en els atributs de git\n"
 "Useu '\\!' per exclamació capdavantera literal."
 
-#: bisect.c:447
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
 
-#: bisect.c:655
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podem bisecar més!\n"
 
-#: bisect.c:708
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No és un nom de comissió vàlid %s"
 
-#: bisect.c:732
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -929,7 +908,7 @@ msgstr ""
 "La base de fusió %s és errònia.\n"
 "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
 
-#: bisect.c:737
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -938,7 +917,7 @@ msgstr ""
 "La base de fusió %s és nova.\n"
 "La propietat s'ha canviat entre %s i [%s].\n"
 
-#: bisect.c:742
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -947,7 +926,7 @@ msgstr ""
 "La base de fusió %s és %s.\n"
 "Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
 
-#: bisect.c:750
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -958,7 +937,7 @@ msgstr ""
 "git bisect no pot funcionar correctament en aquest cas.\n"
 "Potser heu confós les revisions %s i %s?\n"
 
-#: bisect.c:763
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -966,11 +945,10 @@ msgid ""
 "We continue anyway."
 msgstr ""
 "s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s "
-"i %s.\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n"
 "Continuem de totes maneres."
 
-#: bisect.c:798
+#: bisect.c:810
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecant: s'ha de provar una base de fusió\n"
@@ -980,26 +958,26 @@ msgstr "Bisecant: s'ha de provar una base de fusió\n"
 msgid "a %s revision is needed"
 msgstr "es necessita una revisió %s"
 
-#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no s'ha pogut crear el fitxer «%s»"
 
-#: bisect.c:918
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer «%s»"
 
-#: bisect.c:948
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
 
-#: bisect.c:968
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era ambdós %s i %s\n"
 
-#: bisect.c:976
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1008,7 +986,7 @@ msgstr ""
 "No s'ha trobat cap comissió comprovable.\n"
 "Potser heu començat amb paràmetres de camí incorrectes?\n"
 
-#: bisect.c:995
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1018,47 +996,41 @@ msgstr[1] "(aproximadament %d passos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1001
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
 msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents i --reverse no funcionen bé juntes."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse i --first-parent-together requereixen una última comissió "
-"especificada"
+msgstr "--reverse i --first-parent-together requereixen una última comissió especificada"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
-#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
-#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
-#: builtin/shortlog.c:191
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 sequencer.c:2901
+#: builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 builtin/log.c:1371
+#: builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "la configuració del passeig per revisions ha fallat"
 
-#: blame.c:1815
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-"--reverse --first-parent junts requereixen un rang de la cadena de mares "
-"primeres"
+#: blame.c:1816
+msgid "--reverse --first-parent together require range along first-parent chain"
+msgstr "--reverse --first-parent junts requereixen un rang de la cadena de mares primeres"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hi ha tal camí %s en %s"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no es pot llegir el blob %s per al camí %s"
@@ -1085,21 +1057,17 @@ msgstr "No s'està establint la branca %s com a la seva pròpia font."
 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» "
-"fent «rebase»."
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» fent «rebase»."
 
 #: branch.c:94
 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
+msgstr "La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
 
 #: branch.c:98
 #, c-format
 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca local «%s» fent "
-"«rebase»."
+msgstr "La branca «%s» està configurada per a seguir la branca local «%s» fent «rebase»."
 
 #: branch.c:99
 #, c-format
@@ -1110,21 +1078,18 @@ msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
-"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
-"«rebase»."
+"La branca «%s» està configurada per a seguir la referència remota «%s» fent «rebase»."
 
 #: branch.c:105
 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr ""
-"La branca «%s» està configurada per a seguir la referència remota «%s»."
+msgstr "La branca «%s» està configurada per a seguir la referència remota «%s»."
 
 #: branch.c:109
 #, c-format
 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
-"La branca «%s» està configurada per a seguir la referència local «%s» fent "
-"«rebase»."
+"La branca «%s» està configurada per a seguir la referència local «%s» fent «rebase»."
 
 #: branch.c:110
 #, c-format
@@ -1140,33 +1105,32 @@ msgstr "No es pot escriure la configuració de la branca font"
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr "No seguint: informació ambigua per a la referència %s"
 
-#: branch.c:185
+#: branch.c:189
 #, c-format
 msgid "'%s' is not a valid branch name."
 msgstr "«%s» no és un nom de branca vàlid."
 
-#: branch.c:190
+#: branch.c:208
 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr "Una branca amb nom «%s» ja existeix."
 
-#: branch.c:197
+#: branch.c:213
 msgid "Cannot force update the current branch."
 msgstr "No es pot actualitzar la branca actual a la força."
 
-#: branch.c:217
+#: branch.c:233
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
-"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
-"una branca."
+"No es pot configurar la informació de seguiment; el punt inicial «%s» no és una branca."
 
-#: branch.c:219
+#: branch.c:235
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la branca font demanada «%s» no existeix"
 
-#: branch.c:221
+#: branch.c:237
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1187,27 +1151,27 @@ msgstr ""
 "«git push -u» per a establir la configuració font\n"
 "mentre pugeu."
 
-#: branch.c:264
+#: branch.c:280
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "No és un nom d'objecte vàlid: «%s»."
 
-#: branch.c:284
+#: branch.c:300
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Nom d'objecte ambigu: «%s»."
 
-#: branch.c:289
+#: branch.c:305
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "No és un punt de ramificació vàlid: «%s»."
 
-#: branch.c:343
+#: branch.c:359
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» ja s'ha agafat a «%s»"
 
-#: branch.c:366
+#: branch.c:382
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD de l'arbre de treball %s no està actualitzat"
@@ -1222,77 +1186,75 @@ msgstr "«%s» no sembla un fitxer de farcell v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
-#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
-#: sequencer.c:2949 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "no s'ha pogut obrir «%s»"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El farcell conté aquesta referència:"
 msgstr[1] "El farcell conté aquestes %d referències:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "El farcell registra una història completa."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El farcell requereix aquesta referència:"
 msgstr[1] "El farcell requereix aquestes %d referències:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "No s'ha pogut executar el pack-objects"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "El pack-objects s'ha mort"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "El rev-list s'ha mort"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
 
-#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "paràmetre no reconegut: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "S'està refusant crear un farcell buit."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no es pot crear «%s»"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "L'index-pack s'ha mort"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valor de color no vàlid: %.*s"
 
-#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1467 builtin/am.c:2105
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 builtin/am.c:1436
+#: builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "no s'ha pogut analitzar %s"
@@ -1302,7 +1264,7 @@ msgstr "no s'ha pogut analitzar %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s no és una comissió!"
 
-#: commit.c:1517
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1313,170 +1275,171 @@ msgstr ""
 "la variable de configuració i18n.commitencoding a la codificació que\n"
 "usi el vostre projecte.\n"
 
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
 msgid "memory exhausted"
 msgstr "memòria esgotada"
 
-#: config.c:187
+#: config.c:186
 msgid "relative config include conditionals must come from files"
 msgstr "els condicionals d'inclusió de configuració relatius han de venir de fitxers"
 
-#: config.c:721
+#: config.c:720
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "línia de configuració %d errònia en el blob %s"
 
-#: config.c:725
+#: config.c:724
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "línia de configuració %d errònia en el fitxer %s"
 
-#: config.c:729
+#: config.c:728
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "línia de configuració %d errònia en l'entrada estàndard"
 
-#: config.c:733
+#: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "línia de configuració %d errònia en el blob de submòdul %s"
 
-#: config.c:737
+#: config.c:736
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "línia de configuració %d errònia en la línia d'ordres %s"
 
-#: config.c:741
+#: config.c:740
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "línia de configuració %d errònia en %s"
 
-#: config.c:869
+#: config.c:868
 msgid "out of range"
 msgstr "fora de rang"
 
-#: config.c:869
+#: config.c:868
 msgid "invalid unit"
 msgstr "unitat no vàlida"
 
-#: config.c:875
+#: config.c:874
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
 
-#: config.c:880
+#: config.c:879
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
 
-#: config.c:883
+#: config.c:882
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
 
-#: config.c:886
+#: config.c:885
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr ""
-"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
+msgstr "valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
 
-#: config.c:889
+#: config.c:888
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr ""
-"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
-"%s: %s"
+msgstr "valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul %s: %s"
 
-#: config.c:892
+#: config.c:891
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr ""
-"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
-"%s"
+msgstr "valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: %s"
 
-#: config.c:895
+#: config.c:894
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
 
-#: config.c:990
+#: config.c:989
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
 
-#: config.c:1085 config.c:1096
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "«%s» per a «%s» no és una marca de temps vàlida"
+
+#: config.c:1094 config.c:1105
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivell de compressió de zlib incorrecte %d"
 
-#: config.c:1213
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creació d'objecte no vàlid: %s"
 
-#: config.c:1372
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivell de compressió de paquet %d Erroni"
 
-#: config.c:1568
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
 
-#: config.c:1900
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
 
-#: config.c:2087
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s no vàlid: «%s»"
 
-#: config.c:2130
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte «keep»"
+msgstr ""
+"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte «keep»"
 
-#: config.c:2156
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
 
-#: config.c:2167
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
 
-#: config.c:2169
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
 
-#: config.c:2228
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s té múltiples valors"
 
-#: config.c:2571 config.c:2789
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat fstat a %s"
 
-#: config.c:2678
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no s'ha pogut establir «%s» a «%s»"
 
-#: config.c:2680 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no s'ha pogut desassignar «%s»"
 
-#: connect.c:50
+#: connect.c:52
 msgid "The remote end hung up upon initial contact"
 msgstr "El costat remot ha penjat en el moment de contacte inicial"
 
-#: connect.c:52
+#: connect.c:54
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -1488,51 +1451,51 @@ msgstr ""
 "Assegureu-vos que tingueu els permisos\n"
 "d'accés correctes i que el dipòsit existeixi."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "S'està comprovant la connectivitat"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "No s'ha pogut executar 'git rev-list'"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "escriptura fallada al rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "s'ha produït un error en tancar l'stdin del rev-list"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "LF reemplaçaria CRLF en %s."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
 "LF reemplaçarà CRLF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball."
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de "
+"treball."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "LF reemplaçaria CRLF en %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "CRLF reemplaçaria LF en %s"
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
 "CRLF reemplaçarà LF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball."
-
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "CRLF reemplaçaria LF en %s"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de "
+"treball."
 
 #: date.c:116
 msgid "in the future"
@@ -1607,7 +1570,7 @@ msgstr[1] "fa %<PRIuMAX> anys"
 msgid "failed to read orderfile '%s'"
 msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
 
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
 msgid "Performing inexact rename detection"
 msgstr "S'està realitzant una detecció inexacta de canvis de nom"
 
@@ -1619,9 +1582,7 @@ msgstr "l'opció «%s» requereix un valor"
 #: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr ""
-"  S'ha produït un error en analitzar el percentatge limitant de dirstat "
-"«%s»\n"
+msgstr "  S'ha produït un error en analitzar el percentatge limitant de dirstat «%s»\n"
 
 #: diff.c:157
 #, c-format
@@ -1630,18 +1591,17 @@ msgstr "  Paràmetre de dirstat desconegut «%s»\n"
 
 #: diff.c:281
 msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"
 msgstr ""
-"el paràmetre de color en moviment ha de ser «no», «default», «zebra», «dimmed_zebra» o «plain»"
+"el paràmetre de color en moviment ha de ser «no», «default», «zebra», «dimmed_zebra» o "
+"«plain»"
 
 #: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr ""
-"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
+msgstr "Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
 
-#: diff.c:398
+#: diff.c:401
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1650,20 +1610,24 @@ msgstr ""
 "S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:3861
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "el diff external s'ha mort, s'està aturant a %s"
 
-#: diff.c:4189
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check i -s són mutualment exclusius"
+msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
 
-#: diff.c:4279
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S and --find-object són mútuament excloents"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificació de camí"
 
-#: diff.c:4445
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1672,235 +1636,248 @@ msgstr ""
 "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4459
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr ""
-"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
+msgstr "S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
 
-#: diff.c:5505
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers."
 
-#: diff.c:5508
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
-msgstr ""
-"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
+msgstr "només s'han trobat còpies des de camins modificats a causa de massa fitxers."
 
-#: diff.c:5511
+#: diff.c:5499
 #, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
+msgid "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
-"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
-"l'ordre."
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar l'ordre."
 
-#: dir.c:1983
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "no s'ha pogut obrir el directori «%s»"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
 
-#: dir.c:2102
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
-msgstr ""
-"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
+msgstr "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
 
-#: dir.c:2885 dir.c:2890
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no s'han pogut crear directoris per %s"
 
-#: dir.c:2915
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
 
-#: entry.c:176
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:177
 msgid "Filtering content"
 msgstr "S'està filtrant el contingut"
 
-#: entry.c:433
+#: entry.c:435
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Remot sense URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: llista superficial esperada"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "error remot: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requereix multi_ack_detailed"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línia de shallow no vàlida: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línia d'unshallow no vàlida: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "no s'ha trobat cap shallow: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "s'ha rebut %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissió no vàlida %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "s'està rendint"
 
-#: fetch-pack.c:534 progress.c:242
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'està marcant %s com a complet"
 
-#: fetch-pack.c:776
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es té %s (%s)"
 
-#: fetch-pack.c:814
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
 
-#: fetch-pack.c:822
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capçalera de paquet errònia"
 
-#: fetch-pack.c:878
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no es pot bifurcar de %s"
 
-#: fetch-pack.c:894
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:896
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:923
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:927
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "El servidor accepta multi_ack_detailed"
 
-#: fetch-pack.c:930
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "El servidor accepta no-done"
 
-#: fetch-pack.c:936
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "El servidor accepta multi_ack"
 
-#: fetch-pack.c:940
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "El servidor accepta side-band-64k"
 
-#: fetch-pack.c:944
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "El servidor accepta banda lateral"
 
-#: fetch-pack.c:948
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "El servidor accepta allow-tip-sha1-in-want"
 
-#: fetch-pack.c:952
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "El servidor accepta allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "El servidor accepta ofs-delta"
 
-#: fetch-pack.c:969
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "El servidor accepta filtre"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versió del servidor és %.*s"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:981
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:992
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "cap comissió en comú"
 
-#: fetch-pack.c:1004
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenció ha fallat."
 
-#: fetch-pack.c:1166
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1188
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referència remota %s"
 
-#: fetch-pack.c:1191
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
@@ -1923,17 +1900,17 @@ msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
 
-#: grep.c:1970
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: no s'ha pogut llegir %s"
 
-#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "s'ha produït un error en fer stat a «%s»"
 
-#: grep.c:1998
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: lectura curta"
@@ -1949,8 +1926,7 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
 
 #: help.c:217
 msgid "These are common Git commands used in various situations:"
-msgstr ""
-"Aquestes són ordres del Git habitualment usades en diverses situacions:"
+msgstr "Aquestes són ordres del Git habitualment usades en diverses situacions:"
 
 #: help.c:281
 #, c-format
@@ -1968,8 +1944,7 @@ msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
 #: help.c:358
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
-"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
+msgstr "ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
 
 #: help.c:363
 #, c-format
@@ -2004,12 +1979,12 @@ msgstr[1] ""
 msgid "git version [<options>]"
 msgstr "git version [<opcions>]"
 
-#: help.c:456
+#: help.c:462
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:460
+#: help.c:466
 msgid ""
 "\n"
 "Did you mean this?"
@@ -2051,8 +2026,7 @@ msgstr ""
 #: ident.c:366
 msgid "no email was given and auto-detection is disabled"
 msgstr ""
-"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
-"inhabilitada"
+"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està inhabilitada"
 
 #: ident.c:371
 #, c-format
@@ -2062,8 +2036,7 @@ msgstr ""
 
 #: ident.c:381
 msgid "no name was given and auto-detection is disabled"
-msgstr ""
-"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
+msgstr "no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
 
 #: ident.c:387
 #, c-format
@@ -2080,11 +2053,19 @@ msgstr "nom d'identitat buit (per <%s>) no és permès"
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nom conté només caràcters no permesos: %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de data no vàlid: %s"
 
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr ""
+
 #: lockfile.c:151
 #, c-format
 msgid ""
@@ -2110,12 +2091,12 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr "No s'ha pogut crear '%s.lock': %s"
 
-#: merge.c:41
+#: merge.c:74
 msgid "failed to read the cache"
 msgstr "s'ha produït un error en llegir la memòria cau"
 
-#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
-#: builtin/checkout.c:595 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex nou"
 
@@ -2132,250 +2113,247 @@ msgstr "addinfo_cache ha fallat per al camí «%s»"
 msgid "error building trees"
 msgstr "error en construir arbres"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "s'ha produït un error en crear el camí «%s»%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": potser un conflicte D/F?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no es pot llegir l'objecte %s «%s»"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob esperat per a %s «%s»"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "s'ha produït un error en obrir «%s»: %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se sap què fer amb %06o %s «%s»"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "S'ha produït un error en executar la fusió interna"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No s'ha pogut afegir %s a la base de dades"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
-"s'ha deixat en l'arbre."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat "
+"en l'arbre."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
-"de %s s'ha deixat en l'arbre."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha "
+"deixat en l'arbre."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
-"s'ha deixat en l'arbre a %s."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat "
+"en l'arbre a %s."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree at %s."
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree "
+"at %s."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
-"de %s s'ha deixat en l'arbre a %s."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha "
+"deixat en l'arbre a %s."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "canvi de nom"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "canviat de nom"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" "
+"in \"%s\"%s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
-"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la branca \"%s\" "
+"canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (deixat sense resolució)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
-"nom %s->%s en %s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de nom %s->%s en "
+"%s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
-"%s"
+msgstr "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "S'està afegint %s fusionat"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "S'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "no es pot llegir l'objecte %s"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objecte %s no és un blob"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "modificació"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "modificat"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "contingut"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "afegiment/afegiment"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "S'està autofusionant %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:944
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "submòdul"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "S'està eliminant %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "fitxer/directori"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "directori/fitxer"
 
-#: merge-recursive.c:1908
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
-"%s"
+msgstr "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a %s"
 
-#: merge-recursive.c:1917
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "S'està afegint %s"
 
-#: merge-recursive.c:1954
+#: merge-recursive.c:1987
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "�ndex brut: no es pot fusionar (bruts: %s)"
+
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "Ja està al dia!"
 
-#: merge-recursive.c:1963
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "la fusió dels arbres %s i %s ha fallat"
 
-#: merge-recursive.c:2060
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "S'està fusionant:"
 
-#: merge-recursive.c:2073
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "s'ha trobat %u avantpassat en comú:"
 msgstr[1] "s'han trobat %u avantpassats en comú:"
 
-#: merge-recursive.c:2112
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "la fusió no ha retornat cap comissió"
 
-#: merge-recursive.c:2175
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte «%s»"
 
-#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "No s'ha pogut escriure l'índex."
 
@@ -2383,28 +2361,28 @@ msgstr "No s'ha pogut escriure l'índex."
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the "
+"previous merge before you start a new notes merge."
 msgstr ""
 "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
-"Useu «git notes merge --commit» o «git notes merge --abort» per "
-"a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
+"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la "
+"fusió prèvia abans de començar una fusió de notes nova."
 
 #: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Valor de notes.rewriteMode erroni: «%s»"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
@@ -2413,7 +2391,7 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Valor erroni de %s: «%s»"
@@ -2423,27 +2401,25 @@ msgstr "Valor erroni de %s: «%s»"
 msgid "unable to parse object: %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
+msgstr "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
+msgstr "desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "ús: %s"
@@ -2451,17 +2427,17 @@ msgstr "ús: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr " o: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2478,8 +2454,8 @@ msgstr "No s'ha pogut fer %s escrivible pel grup"
 #: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
-"El caràcter d'escapament '\\' no està permès com a últim caràcter en un "
-"valor d'un atribut"
+"El caràcter d'escapament '\\' no està permès com a últim caràcter en un valor d'un "
+"atribut"
 
 #: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
@@ -2496,17 +2472,14 @@ msgstr "nom d'atribut no vàlid %s"
 
 #: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr ""
-"els paràmetres d'especificació de camí 'glob' i 'noglob' globals són "
-"incompatibles"
+msgstr "els paràmetres d'especificació de camí 'glob' i 'noglob' globals són incompatibles"
 
 #: pathspec.c:265
 msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+"global 'literal' pathspec setting is incompatible with all other global pathspec settings"
 msgstr ""
-"el paràmetre d'especificació de camí 'literal' global és incompatible amb "
-"tots els altres paràmetres d'especificació de camí globals"
+"el paràmetre d'especificació de camí 'literal' global és incompatible amb tots els "
+"altres paràmetres d'especificació de camí globals"
 
 #: pathspec.c:305
 msgid "invalid parameter for pathspec magic 'prefix'"
@@ -2545,19 +2518,9 @@ msgstr "«%s» (mnemònic: '%c')"
 #: pathspec.c:525
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
-msgstr ""
-"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
+msgstr "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
 
-#: pathspec.c:571
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"es faran no vàlides les cadenes buides com especificacions de camí en "
-"versions futures. Useu . en lloc d'això si volíeu coincidir amb "
-"tots els camins"
-
-#: pathspec.c:595
+#: pathspec.c:592
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
@@ -2566,7 +2529,7 @@ msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
 msgid "unable to parse --pretty format"
 msgstr "no s'ha pogut analitzar el format --pretty"
 
-#: read-cache.c:1443
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2575,7 +2538,7 @@ msgstr ""
 "index.version està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1453
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2584,52 +2547,51 @@ msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:2316 builtin/merge.c:1046
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "no s'ha pogut tancar «%s»"
 
-#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no s'ha pogut fer stat a «%s»"
 
-#: read-cache.c:2407
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no s'ha pogut obrir el directori git: %s"
 
-#: read-cache.c:2419
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaçar: %s"
 
-#: refs.c:638
+#: refs.c:706
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "No s'ha pogut obrir «%s» per a escriptura"
 
-#: refs.c:1792
+#: refs.c:1850
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "no està permès actualitzar les referències en un entorn de quarantena"
 
-#: refs/files-backend.c:1136
+#: refs/files-backend.c:1189
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no s'ha pogut eliminar la referència %s"
 
-#: refs/files-backend.c:1150 refs/packed-backend.c:1430
-#: refs/packed-backend.c:1440
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528 refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no s'ha pogut suprimir la referència %s: %s"
 
-#: refs/files-backend.c:1153 refs/packed-backend.c:1443
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no s'han pogut suprimir les referències: %s"
 
-#: ref-filter.c:35 wt-status.c:1811
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "no hi és"
 
@@ -2648,157 +2610,157 @@ msgstr "darrere per %d"
 msgid "ahead %d, behind %d"
 msgstr "davant per %d, darrere per %d"
 
-#: ref-filter.c:105
+#: ref-filter.c:107
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format esperat: %%(color:<color>)"
 
-#: ref-filter.c:107
+#: ref-filter.c:109
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconegut: %%(color:%s)"
 
-#: ref-filter.c:127
+#: ref-filter.c:129
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "valor enter esperat pel nom de referència:lstrip=%s"
 
-#: ref-filter.c:131
+#: ref-filter.c:133
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "valor enter esperat pel nom de referència:rstrip=%s"
 
-#: ref-filter.c:133
+#: ref-filter.c:135
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "paràmetre %%(%s) desconegut: %s"
 
-#: ref-filter.c:173
+#: ref-filter.c:184
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no accepta paràmetres"
 
-#: ref-filter.c:180
+#: ref-filter.c:191
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no accepta paràmetres"
 
-#: ref-filter.c:198
+#: ref-filter.c:209
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "paràmetre %%(trailers) desconegut: %s"
 
-#: ref-filter.c:221
+#: ref-filter.c:232
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat conté:lines=%s"
 
-#: ref-filter.c:223
+#: ref-filter.c:234
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "paràmetre %%(contents) no reconegut: %s"
 
-#: ref-filter.c:236
+#: ref-filter.c:247
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positiu esperat nom d'objecte:curt=%s"
 
-#: ref-filter.c:240
+#: ref-filter.c:251
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "paràmetre %%(objectname) no reconegut: %s"
 
-#: ref-filter.c:267
+#: ref-filter.c:278
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format esperat: %%(align:<amplada>,<posició>)"
 
-#: ref-filter.c:279
+#: ref-filter.c:290
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posició no reconeguda:%s"
 
-#: ref-filter.c:283
+#: ref-filter.c:294
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:289
+#: ref-filter.c:300
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "paràmetre %%(align) no reconegut: %s"
 
-#: ref-filter.c:293
+#: ref-filter.c:304
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "amplada positiva esperada amb l'àtom %%(align)"
 
-#: ref-filter.c:308
+#: ref-filter.c:319
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "paràmetre %%(if) no reconegut: %s"
 
-#: ref-filter.c:398
+#: ref-filter.c:409
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de camp mal format: %.*s"
 
-#: ref-filter.c:424
+#: ref-filter.c:435
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de camp desconegut: %.*s"
 
-#: ref-filter.c:536
+#: ref-filter.c:547
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
 
-#: ref-filter.c:596
+#: ref-filter.c:607
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
 
-#: ref-filter.c:598
+#: ref-filter.c:609
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
 
-#: ref-filter.c:600
+#: ref-filter.c:611
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
 
-#: ref-filter.c:626
+#: ref-filter.c:637
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
 
-#: ref-filter.c:628
+#: ref-filter.c:639
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
 
-#: ref-filter.c:630
+#: ref-filter.c:641
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
 
-#: ref-filter.c:643
+#: ref-filter.c:654
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
 
-#: ref-filter.c:698
+#: ref-filter.c:709
 #, c-format
 msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
-#: ref-filter.c:1283
+#: ref-filter.c:1313
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(cap branca, s'està fent «rebase» %s)"
 
-#: ref-filter.c:1286
+#: ref-filter.c:1316
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(cap branca, bisecció començada en %s)"
@@ -2806,7 +2768,7 @@ msgstr "(cap branca, bisecció començada en %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1294
+#: ref-filter.c:1324
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD separat a %s)"
@@ -2814,154 +2776,160 @@ msgstr "(HEAD separat a %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1301
+#: ref-filter.c:1331
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD separat de %s)"
 
-#: ref-filter.c:1305
+#: ref-filter.c:1335
 msgid "(no branch)"
 msgstr "(cap branca)"
 
-#: ref-filter.c:1454 ref-filter.c:1485
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "manca l'objecte %s per a %s"
 
-#: ref-filter.c:1457 ref-filter.c:1488
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer ha fallat en %s per a %s"
 
-#: ref-filter.c:1788
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objecte mal format a «%s»"
 
-#: ref-filter.c:1855
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "s'està ignorant la referència amb nom malmès %s"
 
-#: ref-filter.c:1860
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "s'està ignorant la referència trencada %s"
 
-#: ref-filter.c:2122
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: manca l'àtom %%(end)"
 
-#: ref-filter.c:2216
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: remote.c:750
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No es poden obtenir ambdós %s i %s a %s"
 
-#: remote.c:754
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s generalment segueix %s, no %s"
 
-#: remote.c:758
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segueix ambdós %s i %s"
 
-#: remote.c:766
+#: remote.c:811
 msgid "Internal error"
 msgstr "Error intern"
 
-#: remote.c:1681 remote.c:1783
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no assenyala cap branca"
 
-#: remote.c:1690
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no hi ha tal branca: «%s»"
 
-#: remote.c:1693
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "cap font configurada per a la branca «%s»"
 
-#: remote.c:1699
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
 
-#: remote.c:1714
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr ""
-"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
+msgstr "el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
 
-#: remote.c:1726
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branca «%s» no té cap remot al qual pujar"
 
-#: remote.c:1737
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les especificacions de referència de «%s» no inclouen «%s»"
 
-#: remote.c:1750
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no té destí (push.default és 'nothing')"
 
-#: remote.c:1772
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
 
-#: remote.c:2076
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
 
-#: remote.c:2080
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (useu \"git branch --unset-upstream\" per a arreglar)\n"
 
-#: remote.c:2083
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "La vostra branca està al dia amb «%s».\n"
 
-#: remote.c:2087
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr ""
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "La vostra branca està davant de «%s» per %d comissió.\n"
 msgstr[1] "La vostra branca està davant de «%s» per %d comissions.\n"
 
-#: remote.c:2093
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (useu \"git push\" per a publicar les vostres comissions locals)\n"
 
-#: remote.c:2096
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 msgstr[0] ""
-"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se "
-"ràpidament.\n"
+"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se ràpidament.\n"
 msgstr[1] ""
-"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se "
-"ràpidament.\n"
+"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se ràpidament.\n"
 
-#: remote.c:2104
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
 
-#: remote.c:2107
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2976,79 +2944,94 @@ msgstr[1] ""
 "La vostra branca i «%s» han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
-#: remote.c:2117
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
 
-#: revision.c:2256
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2259
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "la branca actual «%s» encara no té cap comissió"
 
-#: revision.c:2453
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent és incompatible amb --bisect"
 
-#: run-command.c:644
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "s'ha produït un error en obrir /dev/null"
 
-#: send-pack.c:151
+#: run-command.c:1274
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament remot"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
 
-#: send-pack.c:153
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "s'ha produït un error en el desempaquetament remot: %s"
 
-#: send-pack.c:316
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "s'ha produït un error en signar el certificat de pujada"
 
-#: send-pack.c:429
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "el destí receptor no admet pujar --signed"
 
-#: send-pack.c:431
+#: send-pack.c:423
 msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"not sending a push certificate since the receiving end does not support --signed push"
 msgstr ""
-"no s'està enviant una certificació de pujada perquè el destí receptor no "
-"admet pujar --signed"
+"no s'està enviant una certificació de pujada perquè el destí receptor no admet pujar --"
+"signed"
 
-#: send-pack.c:443
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "el destí receptor no admet pujar --atomic"
 
-#: send-pack.c:448
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "el destí receptor no admet opcions de pujada"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Acció desconeguda: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3056,7 +3039,7 @@ msgstr ""
 "després de resoldre els conflictes, marqueu els camins\n"
 "corregits amb 'git add <camins>' o 'git rm <camins>'"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3066,43 +3049,43 @@ msgstr ""
 "corregits amb 'git add <camins>' o 'git rm <camins>'\n"
 "i cometeu el resultat amb 'git commit'"
 
-#: sequencer.c:297 sequencer.c:1704
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no s'ha pogut bloquejar «%s»"
 
-#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
-#: sequencer.c:2733 sequencer.c:2749
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 sequencer.c:3246
+#: sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no s'ha pogut escriure a «%s»"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
 
-#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "s'ha produït un error en finalitzar «%s»."
+msgid "failed to finalize '%s'"
+msgstr "s'ha produït un error en finalitzar «%s»"
 
-#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1044
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 builtin/commit.c:722
+#: builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "no s'ha pogut llegir «%s»"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "els vostres canvis locals se sobreescriurien per %s."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanç ràpid"
@@ -3110,20 +3093,20 @@ msgstr "%s: avanç ràpid"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:474
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
 
-#: sequencer.c:493
-msgid "could not resolve HEAD commit\n"
-msgstr "no s'ha pogut resoldre la comissió HEAD\n"
+#: sequencer.c:542
+msgid "could not resolve HEAD commit"
+msgstr "no s'ha pogut resoldre la comissió HEAD"
 
-#: sequencer.c:513
-msgid "unable to update cache tree\n"
-msgstr "no s'ha pogut actualitzar l'arbre cau\n"
+#: sequencer.c:562
+msgid "unable to update cache tree"
+msgstr "no s'ha pogut actualitzar l'arbre cau"
 
-#: sequencer.c:597
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3140,8 +3123,7 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 "teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, "
-"executeu:\n"
+"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
@@ -3153,17 +3135,125 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:699
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "el lligam «prepare-commit-msg» ha fallat"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"S'han configurat el vostre nom i adreça electrònica\n"
+"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
+"Comproveu que siguin correctes. Podeu suprimir aquest\n"
+"missatge establint-los explícitament. Executeu l'ordre següent i\n"
+"seguiu les instruccions en el vostre editor per editar el vostre\n"
+"fitxer de configuració:\n"
+"\n"
+"    git config --global --edit\n"
+"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"comissió amb:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"S'han configurat el vostre nom i adreça electrònica\n"
+"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
+"Comproveu que siguin correctes. Podeu suprimir aquest\n"
+"missatge establint-los explícitament:\n"
+"\n"
+"    git config --global user.name \"El Vostre Nom\"\n"
+"    git config --global user.email tu@example.com\n"
+"\n"
+"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"comissió amb:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "no s'ha pogut trobar la comissió novament creada"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "no s'ha pogut analitzar la comissió novament creada"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "HEAD separat"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (comissió d'arrel)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "no s'ha pogut analitzar HEAD"
+
+#: sequencer.c:1052
 #, c-format
-msgid "could not parse commit %s\n"
-msgstr "no s'ha pogut analitzar la comissió %s\n"
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s no és una comissió!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "no s'ha pogut analitzar la comissió HEAD"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "no s'ha pogut analitzar l'autor de la comissió"
 
-#: sequencer.c:704
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
+#: sequencer.c:1134 sequencer.c:1186
 #, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "no s'ha pogut analitzar la comissió pare %s\n"
+msgid "unable to read commit message from '%s'"
+msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
 
-#: sequencer.c:826
+#: sequencer.c:1213
+#, c-format
+msgid "could not parse commit %s"
+msgstr "no s'ha pogut analitzar la comissió %s"
+
+#: sequencer.c:1218
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "no s'ha pogut analitzar la comissió pare %s"
+
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3174,7 +3264,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:832
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3185,231 +3275,244 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:838 sequencer.c:863
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Això és una combinació de %d comissions."
 
-#: sequencer.c:847 sequencer.c:2681
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "cal un HEAD per reparar-ho"
 
-#: sequencer.c:849
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:851
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
 
-#: sequencer.c:857
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no es pot escriure «%s»"
 
-#: sequencer.c:866 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "Aquest és el 1r missatge de comissió:"
 
-#: sequencer.c:874
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: sequencer.c:881
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Aquest és el missatge de comissió #%d:"
 
-#: sequencer.c:886
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El missatge de comissió núm. #%d s'ometrà:"
 
-#: sequencer.c:891
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:957
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'índex està sense fusionar."
 
-#: sequencer.c:975
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
 
-#: sequencer.c:983
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "la comissió %s no té pare %d"
 
-#: sequencer.c:987
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
-msgstr ""
-"s'ha especificat la línia principal però la comissió %s no és una fusió."
+msgstr "s'ha especificat la línia principal però la comissió %s no és una fusió."
 
-#: sequencer.c:993
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no es pot obtenir el missatge de comissió de %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1014
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissió pare %s"
 
-#: sequencer.c:1077 sequencer.c:1853
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
 
-#: sequencer.c:1128
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:1129
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:1171
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:1181
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: s'ha produït un error en llegir l'índex"
 
-#: sequencer.c:1188
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: s'ha produït un error en actualitzar l'índex"
 
-#: sequencer.c:1308
+#: sequencer.c:1792
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s no accepta paràmetres: «%s»"
+
+#: sequencer.c:1801
+#, c-format
+msgid "missing arguments for %s"
+msgstr "falten els arguments per %s"
+
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línia no vàlida %d: %.*s"
 
-#: sequencer.c:1316
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "No es pot «%s» sense una comissió prèvia"
 
-#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
-#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "no s'ha pogut llegir «%s»."
 
-#: sequencer.c:1361
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corregiu-ho usant «git rebase --edit-todo»."
 
-#: sequencer.c:1363
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "full d'instruccions inusable: «%s»"
 
-#: sequencer.c:1368
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissió."
 
-#: sequencer.c:1379
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer «cherry pick» durant una reversió."
 
-#: sequencer.c:1381
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un «cherry pick»."
 
-#: sequencer.c:1448
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vàlida: %s"
 
-#: sequencer.c:1451
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: sequencer.c:1517
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "full d'opcions mal format: «%s»"
 
-#: sequencer.c:1555
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un «cherry pick» o una reversió ja està en curs"
 
-#: sequencer.c:1556
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1559
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
 
-#: sequencer.c:1574
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:1632 sequencer.c:2211
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
 
-#: sequencer.c:1634
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:1636 sequencer.c:1671
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
 
-#: sequencer.c:1657 builtin/grep.c:711
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no es pot obrir «%s»"
 
-#: sequencer.c:1659
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no es pot llegir «%s»: %s"
 
-#: sequencer.c:1660
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:1666
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
 
-#: sequencer.c:1677
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
 
-#: sequencer.c:1818 sequencer.c:2109
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "no s'ha pogut actualitzar %s"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: sequencer.c:1858 builtin/difftool.c:640
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:1874
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "no s'ha pogut llegir l'índex"
 
-#: sequencer.c:1879
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3424,11 +3527,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1885
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
 
-#: sequencer.c:1891
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3444,17 +3547,17 @@ msgstr ""
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:1948
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "S'ha aplicat el «stash» automàticament.\n"
 
-#: sequencer.c:1960
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:1963 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3465,57 +3568,52 @@ msgstr ""
 "Els vostres canvis estan segurs en el «stash».\n"
 "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
 
-#: sequencer.c:2045
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:2087
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:2117
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "No s'ha pogut llegir orig-head"
 
-#: sequencer.c:2122 sequencer.c:2678
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "no s'ha pogut llegir 'onto'"
 
-#: sequencer.c:2129
-#, c-format
-msgid "could not update %s"
-msgstr "no s'ha pogut actualitzar %s"
-
-#: sequencer.c:2136
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:2220
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
 
-#: sequencer.c:2225
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:2234
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissió no existent"
 
-#: sequencer.c:2236
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fitxer no vàlid: «%s»"
 
-#: sequencer.c:2238
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contingut no vàlid: «%s»"
 
-#: sequencer.c:2241
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3525,111 +3623,91 @@ msgstr ""
 "Teniu canvis no comesos en el vostre arbre de treball. \n"
 "Primer cometeu-los i després executeu 'git rebase --continue' de nou."
 
-#: sequencer.c:2251
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "No s'han pogut cometre els canvis «staged»."
 
-#: sequencer.c:2331
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no es pot fer «cherry pick» a %s"
 
-#: sequencer.c:2335
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisió incorrecta"
 
-#: sequencer.c:2368
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissió inicial"
 
-#: sequencer.c:2471
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: opcions no gestionades"
 
-#: sequencer.c:2474
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: s'ha produït un error en preparar les revisions"
 
-#: sequencer.c:2510
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "llista per a fer inestable: «%s»"
 
-#: sequencer.c:2516
+#: sequencer.c:3146
 #, c-format
-msgid "unable to open '%s' for writing"
-msgstr "no s'ha pogut obrir «%s» per a escriptura"
+msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està ignorant."
 
-#: sequencer.c:2561
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. "
-"S'està ignorant."
-
-#: sequencer.c:2641
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
+"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n"
 "Les comissions descartades (més nova a més vella):\n"
 
-#: sequencer.c:2648
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
-"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
-"comissió.\n"
+"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una comissió.\n"
 "\n"
-"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
-"d'advertències.\n"
+"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell d'advertències.\n"
 "Els comportaments possibles són: ignore, warn, error.\n"
 
-#: sequencer.c:2660
+#: sequencer.c:3231
 #, c-format
 msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
-"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
-"continue'.\n"
-
-#: sequencer.c:2708
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "no s'ha pogut analitzar la comissió «%s»"
+"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --continue'.\n"
 
-#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:775
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no s'ha pogut obrir «%s» per a escriptura"
 
-#: sequencer.c:2756
+#: sequencer.c:3285
 #, c-format
-msgid "could not truncate '%s'"
-msgstr "no s'ha pogut truncar a «%s»"
+msgid "could not parse commit '%s'"
+msgstr "no s'ha pogut analitzar la comissió «%s»"
 
-#: sequencer.c:2848
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "l'script ja estava endreçat."
 
-#: sequencer.c:2953
+#: setup.c:122
 #, c-format
-msgid "could not finish '%s'"
-msgstr "no s'ha pogut finalitzar «%s»"
+msgid "'%s' is outside repository"
+msgstr "«%s» és fora del dipòsit"
 
 #: setup.c:171
 #, c-format
@@ -3638,8 +3716,7 @@ msgid ""
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 "%s: no hi ha tal camí en l'arbre de treball.\n"
-"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin "
-"localment."
+"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin localment."
 
 #: setup.c:184
 #, c-format
@@ -3652,6 +3729,11 @@ msgstr ""
 "Useu '--' per a separar els camins de les revisions, com això:\n"
 "'git <ordre> [<revisió>...] -- [<fitxer>...]'"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "l'opció «%s» ha de venir abans dels arguments opcionals"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3663,90 +3745,157 @@ msgstr ""
 "Useu '--' per a separar els camins de les revisions, com això:\n"
 "'git <ordre> [<revisió>...] -- [<fitxer>...]'"
 
-#: setup.c:499
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "no s'ha configurar un arbre de treball utilitzant una configuració no vàlida"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "aquesta operació s'ha d'executar en un arbre de treball"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
 
-#: setup.c:507
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "s'han trobat extensions de dipòsit desconegudes:"
 
-#: setup.c:806
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s"
+msgid "error opening '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
 
-#: setup.c:808 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "No es pot tornar al directori de treball actual"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "massa larg per a ser un fitxer .git: «%s»"
 
-#: setup.c:1046
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "error en llegir %s"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "format gitfile no vàlid: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "sense camí al gitfile: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "no és un dipòsit de git: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "«$%s» massa gran"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "no és un dipòsit de git: «%s»"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "no es pot canviar de directori a «%s»"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "no es pot tornar al directori de treball actual"
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
+
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1058 setup.c:1064
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "No es pot canviar a «%s»"
+msgid "cannot change to '%s'"
+msgstr "no es pot canviar a «%s»"
 
-#: setup.c:1077
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"No un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n"
-"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"no està establert)."
+"no un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n"
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està "
+"establert)."
 
-#: setup.c:1159
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
-"(0%.3o).\n"
-"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
-"escriptura."
+"hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
+"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura."
+
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "s'ha produït un error en obrir /dev/null o dup"
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "el «fork» ha fallat"
 
-#: sha1_file.c:528
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "l'«stash» ha fallat"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "el camí «%s» no existeix"
 
-#: sha1_file.c:554
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
+msgstr "Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
 
-#: sha1_file.c:560
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "el dipòsit de referència «%s» no és un dipòsit local."
 
-#: sha1_file.c:566
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "el dipòsit de referència «%s» és superficial"
 
-#: sha1_file.c:574
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "el dipòsit de referència «%s» és empeltat"
 
-#: sha1_name.c:420
+#: sha1_name.c:422
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "l'SHA1 %s curt és ambigu"
 
-#: sha1_name.c:431
+#: sha1_name.c:433
 msgid "The candidates are:"
 msgstr "Els candidats són:"
 
-#: sha1_name.c:590
+#: sha1_name.c:693
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3770,90 +3919,85 @@ msgstr ""
 "suprimiu-les. Desactiveu aquest missatge executant\n"
 "«git config advice.objectNameWarning false»"
 
-#: submodule.c:93 submodule.c:127
+#: submodule.c:96 submodule.c:130
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
-"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
-"de fusió"
+"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes de fusió"
 
-#: submodule.c:97 submodule.c:131
+#: submodule.c:100 submodule.c:134
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
 
-#: submodule.c:105
+#: submodule.c:108
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
 
-#: submodule.c:138
+#: submodule.c:141
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
 
-#: submodule.c:149
+#: submodule.c:152
 msgid "staging updated .gitmodules failed"
 msgstr "l'allistament del .gitmodules actualitzat ha fallat"
 
-#: submodule.c:309
+#: submodule.c:312
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "al submòdul no populat «%s»"
 
-#: submodule.c:340
+#: submodule.c:343
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "L'especificació «%s» és en el submòdul «%.*s»"
 
-#: submodule.c:799
+#: submodule.c:833
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
 
-#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
 
-#: submodule.c:1304
+#: submodule.c:1370
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "«%s» no reconegut com un dipòsit git"
 
-#: submodule.c:1442
+#: submodule.c:1508
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
 
-#: submodule.c:1455
+#: submodule.c:1521
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
 
-#: submodule.c:1548
+#: submodule.c:1614
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "el submòdul «%s» té l'índex brut"
 
-#: submodule.c:1809
+#: submodule.c:1878
 #, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr ""
-"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
-"treball"
+msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de treball"
 
-#: submodule.c:1821 submodule.c:1877
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no s'ha trobat el nom pel submòdul «%s»"
 
-#: submodule.c:1825 builtin/submodule--helper.c:671
-#: builtin/submodule--helper.c:681
+#: submodule.c:1894 builtin/submodule--helper.c:1246 builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no s'ha pogut crear el directori «%s»"
 
-#: submodule.c:1828
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3864,20 +4008,20 @@ msgstr ""
 "«%s» a\n"
 "«%s»\n"
 
-#: submodule.c:1912
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
 
-#: submodule.c:1956
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "no s'ha pogut iniciar ls-files a .."
 
-#: submodule.c:1976
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
 
-#: submodule.c:1995
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
@@ -3896,8 +4040,7 @@ msgstr "valor no vàlid per a %s"
 msgid "running trailer command '%s' failed"
 msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 trailer.c:557
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "valor desconegut «%s» per a la clau «%s»"
@@ -3945,17 +4088,17 @@ msgstr "no s'ha pogut obrir el fitxer temporal"
 msgid "could not rename temporary file to %s"
 msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
 
-#: transport.c:62
+#: transport.c:63
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
 
-#: transport.c:151
+#: transport.c:152
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opció de profunditat no vàlida «%s»"
 
-#: transport.c:888
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3964,7 +4107,7 @@ msgstr ""
 "Els camins de submòdul següents contenen canvis que no\n"
 "es poden trobar en cap remot:\n"
 
-#: transport.c:892
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3990,11 +4133,11 @@ msgstr ""
 "\n"
 "per a pujar-los a un remot.\n"
 
-#: transport.c:900
+#: transport.c:928
 msgid "Aborting."
 msgstr "S'està avortant."
 
-#: transport-helper.c:1071
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "No s'ha pogut llegir la referència %s"
@@ -4015,48 +4158,43 @@ msgstr "nom de fitxer buit en una entrada d'arbre"
 msgid "too-short tree file"
 msgstr "fitxer d'arbre massa curt"
 
-#: unpack-trees.c:106
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
-"%%sCometeu els vostres canvis o feu «stash» abans de canviar de "
-"branca."
+"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
+"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
 
-#: unpack-trees.c:108
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
 "%%s"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4065,7 +4203,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de %s."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4074,7 +4212,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:123
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4083,47 +4221,43 @@ msgstr ""
 "En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
 "%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:129
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4132,7 +4266,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4141,106 +4275,95 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:144
+#: unpack-trees.c:146
 #, c-format
 msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:146
+#: unpack-trees.c:148
 #, c-format
 msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:151
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:163
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrada «%s» encavalca amb «%s».  No es pot vincular."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
-"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
-"dia:\n"
+"No es pot actualitzar l'agafament parcial: les entrades següents no estan al dia:\n"
 "%s"
 
-#: unpack-trees.c:168
+#: unpack-trees.c:170
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following working tree files would be overwritten by sparse checkout update:\n"
 "%s"
 msgstr ""
-"Els fitxers següents en l'arbre de treball se sobreescriurien per "
-"actualitzar l'agafament parcial:\n"
+"Els fitxers següents en l'arbre de treball se sobreescriurien per actualitzar "
+"l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:172
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following working tree files would be removed by sparse checkout update:\n"
 "%s"
 msgstr ""
-"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
-"l'agafament parcial:\n"
+"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar l'agafament "
+"parcial:\n"
 "%s"
 
-#: unpack-trees.c:172
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4249,12 +4372,12 @@ msgstr ""
 "No es pot actualitzar el submòdul:\n"
 "%s"
 
-#: unpack-trees.c:249
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "S'està avortant\n"
 
-#: unpack-trees.c:331
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "S'estan agafant fitxers"
 
@@ -4287,18 +4410,43 @@ msgstr "número de port no vàlid"
 msgid "invalid '..' path segment"
 msgstr "segment de camí '..' no vàlid"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "s'ha produït un error en llegir «%s»"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "«%s» no existeix"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "«%s» no és un fitxer .git, codi d'error %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "«%s» no assenyala de tornada a «%s»"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
 
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
-#: builtin/am.c:858 builtin/merge.c:1041
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 builtin/am.c:862
+#: builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no s'ha pogut obrir «%s» per a lectura"
@@ -4312,165 +4460,150 @@ msgstr "no s'ha pogut accedir a «%s»"
 msgid "unable to get current working directory"
 msgstr "no s'ha pogut obtenir el directori de treball actual"
 
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "no s'ha pogut escriure a %s"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "no s'ha pogut tancar %s"
-
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "Camins sense fusionar:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (useu \"git add <fitxer>...\" per a senyalar resolució)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr ""
-"  (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
-"resolució)"
+msgstr "  (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar resolució)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (useu \"git rm <fitxer>...\" per a senyalar resolució)"
 
-#: wt-status.c:198 wt-status.c:979
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "Canvis a cometre:"
 
-#: wt-status.c:216 wt-status.c:988
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Canvis no «staged» per a cometre:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
 
-#: wt-status.c:223
-msgid ""
-"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: wt-status.c:224
+msgid "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
-"  (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
-"directori de treball)"
+"  (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el directori de "
+"treball)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-"  (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
+msgstr "  (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
+msgstr "  (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "suprimit per ambdós:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "afegit per nosaltres:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "suprimit per ells:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "afegit per ells:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "suprimit per nosaltres:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "afegit per ambdós:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "modificat per ambdós:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "fitxer nou:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "copiat:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "suprimit:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "modificat:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "canviat de nom:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "canviat de tipus:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "desconegut:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "sense fusionar:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "comissions noves, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "contingut modificat, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "contingut no seguit, "
 
-#: wt-status.c:819
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "L'«stash» té actualment %d entrada"
 msgstr[1] "L'«stash» té actualment %d entrades"
 
-#: wt-status.c:851
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Submòduls canviats però no actualitzats:"
 
-#: wt-status.c:853
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Canvis de submòdul a cometre:"
 
-#: wt-status.c:935
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4478,242 +4611,230 @@ msgstr ""
 "No modifiqueu o suprimiu la línia de dalt.\n"
 "Tot el que hi ha a sota s'ignorarà."
 
-#: wt-status.c:1048
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "Teniu camins sense fusionar."
 
-#: wt-status.c:1051
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregleu els conflictes i executeu \"git commit\")"
 
-#: wt-status.c:1053
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (useu \"git merge --abort\" per a avortar la fusió)"
 
-#: wt-status.c:1058
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
 
-#: wt-status.c:1061
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (useu \"git commit\" per a concloure la fusió)"
 
-#: wt-status.c:1071
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "Esteu enmig d'una sessió am."
 
-#: wt-status.c:1074
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "El pedaç actual està buit."
 
-#: wt-status.c:1078
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregleu els conflictes i després executeu \"git am --continue\")"
 
-#: wt-status.c:1080
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (useu \"git am --skip\" per a ometre aquest pedaç)"
 
-#: wt-status.c:1082
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (useu \"git am --abort\" per a restaurar la branca original)"
 
-#: wt-status.c:1214
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "Manca git-rebase-todo."
 
-#: wt-status.c:1216
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "No s'ha fet cap ordre."
 
-#: wt-status.c:1219
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Última ordre feta (%d ordre feta):"
 msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
 
-#: wt-status.c:1230
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (vegeu més en el fitxer %s)"
 
-#: wt-status.c:1235
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "No manca cap ordre."
 
-#: wt-status.c:1238
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Ordre següent a fer (manca %d ordre):"
 msgstr[1] "Ordres següents a fer (manquen %d ordres):"
 
-#: wt-status.c:1246
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (useu \"git rebase --edit-todo\" per a veure i editar)"
 
-#: wt-status.c:1259
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
 
-#: wt-status.c:1264
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "Actualment esteu fent «rebase»."
 
-#: wt-status.c:1278
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr ""
-"  (arregleu els conflictes i després executeu \"git rebase --continue\")"
+msgstr "  (arregleu els conflictes i després executeu \"git rebase --continue\")"
 
-#: wt-status.c:1280
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (useu \"git rebase --skip\" per a ometre aquest pedaç)"
 
-#: wt-status.c:1282
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (useu \"git rebase --abort\" per a agafar la branca original)"
 
-#: wt-status.c:1288
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
+msgstr "  (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
 
-#: wt-status.c:1292
+#: wt-status.c:1320
 #, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
-"«%s» en «%s»."
+"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca «%s» en «%s»."
 
-#: wt-status.c:1297
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Actualment esteu dividint una comissió durant un «rebase»."
 
-#: wt-status.c:1300
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
-"  (Una vegada que el vostre directori de treball sigui net, executeu \"git "
-"rebase --continue\")"
+"  (Una vegada que el vostre directori de treball sigui net, executeu \"git rebase --"
+"continue\")"
 
-#: wt-status.c:1304
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
-"«%s» en «%s»."
+"Actualment esteu editant una comissió mentre es fa «rebase» de la branca «%s» en «%s»."
 
-#: wt-status.c:1309
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "Actualment esteu editant una comissió durant un «rebase»."
 
-#: wt-status.c:1312
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (useu \"git commit --amend\" per a esmenar la comissió actual)"
 
-#: wt-status.c:1314
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: wt-status.c:1342
+msgid "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
-"  (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
-"vostres canvis)"
+"  (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els vostres "
+"canvis)"
 
-#: wt-status.c:1324
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
 
-#: wt-status.c:1329
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
 
-#: wt-status.c:1332
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
-"\")"
+msgstr "  (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue\")"
 
-#: wt-status.c:1334
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr ""
-"  (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry "
-"pick»)"
+msgstr "  (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry pick»)"
 
-#: wt-status.c:1343
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Actualment esteu revertint la comissió %s."
 
-#: wt-status.c:1348
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (arregleu els conflictes i executeu \"git revert --continue\")"
 
-#: wt-status.c:1351
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
+msgstr "  (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
 
-#: wt-status.c:1353
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-"  (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
+msgstr "  (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
 
-#: wt-status.c:1364
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
 
-#: wt-status.c:1368
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "Actualment esteu bisecant."
 
-#: wt-status.c:1371
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (useu \"git bisect reset\" per a tornar a la branca original)"
 
-#: wt-status.c:1568
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "En la branca "
 
-#: wt-status.c:1574
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "«rebase» interactiu en curs; sobre "
 
-#: wt-status.c:1576
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "«rebase» en curs; sobre "
 
-#: wt-status.c:1581
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "HEAD separat a "
 
-#: wt-status.c:1583
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "HEAD separat de "
 
-#: wt-status.c:1586
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Actualment no s'és en cap branca."
 
-#: wt-status.c:1606
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Comissió inicial"
 
-#: wt-status.c:1607
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "No s'ha fet cap comissió encara."
 
-#: wt-status.c:1621
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "Fitxers no seguits"
 
-#: wt-status.c:1623
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Fitxers ignorats"
 
-#: wt-status.c:1627
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4725,99 +4846,98 @@ msgstr ""
 "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
 "'git help status')."
 
-#: wt-status.c:1633
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Els fitxers no seguits no estan llistats%s"
 
-#: wt-status.c:1635
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
 
-#: wt-status.c:1641
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "Sense canvis"
 
-#: wt-status.c:1646
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
+msgstr "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
 
-#: wt-status.c:1649
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no hi ha canvis afegits a cometre\n"
 
-#: wt-status.c:1652
+#: wt-status.c:1680
 #, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n"
 msgstr ""
-"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add"
-"\" per a seguir-los)\n"
+"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add\" per a "
+"seguir-los)\n"
 
-#: wt-status.c:1655
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
 
-#: wt-status.c:1658
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
-"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
-"los)\n"
+"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-los)\n"
 
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "no hi ha res a cometre\n"
 
-#: wt-status.c:1664
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
+msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
 
-#: wt-status.c:1668
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
 
-#: wt-status.c:1780
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "No s'ha fet cap comissió encara a "
 
-#: wt-status.c:1784
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (sense branca)"
 
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1844
+msgid "different"
+msgstr "diferent"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "darrere "
 
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "davant per "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no es pot %s: Teniu canvis «unstaged»."
 
-#: wt-status.c:2317
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "addicionalment, el vostre índex conté canvis sense cometre."
 
-#: wt-status.c:2319
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "s'ha produït un error en desenllaçar «%s»"
@@ -4826,125 +4946,126 @@ msgstr "s'ha produït un error en desenllaçar «%s»"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/add.c:82
+#: builtin/add.c:83
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:87 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "s'ha produït un error en actualitzar els fitxers"
 
-#: builtin/add.c:97
+#: builtin/add.c:98
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina «%s»\n"
 
-#: builtin/add.c:153
+#: builtin/add.c:173
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:213 builtin/rev-parse.c:888
+#: builtin/add.c:233 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'índex"
 
-#: builtin/add.c:224
+#: builtin/add.c:244
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No s'ha pogut obrir «%s» per a escriptura."
 
-#: builtin/add.c:228
+#: builtin/add.c:248
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:231
+#: builtin/add.c:251
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:234
+#: builtin/add.c:254
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a «%s»"
 
-#: builtin/add.c:236
+#: builtin/add.c:256
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:241
+#: builtin/add.c:261
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar «%s»"
 
-#: builtin/add.c:251
+#: builtin/add.c:271
 msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr ""
-"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
 
-#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 builtin/remote.c:1333
+#: builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "marxa en sec"
 
-#: builtin/add.c:274
+#: builtin/add.c:294
 msgid "interactive picking"
 msgstr "recull interactiu"
 
-#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:276
+#: builtin/add.c:296
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:277
+#: builtin/add.c:297
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:278
+#: builtin/add.c:298
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:279
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+
+#: builtin/add.c:300
 msgid "record only the fact that the path will be added later"
 msgstr "registra només el fet que el camí s'afegirà més tard"
 
-#: builtin/add.c:280
+#: builtin/add.c:301
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:283
+#: builtin/add.c:304
 msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr ""
-"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
+msgstr "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
 
-#: builtin/add.c:285
+#: builtin/add.c:306
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:286
+#: builtin/add.c:307
 msgid "just skip files which cannot be added because of errors"
 msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
 
-#: builtin/add.c:287
+#: builtin/add.c:308
 msgid "check if - even missing - files are ignored in dry run"
-msgstr ""
-"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
+msgstr "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
 
-#: builtin/add.c:288 builtin/update-index.c:954
+#: builtin/add.c:309 builtin/update-index.c:964
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:288 builtin/update-index.c:955
+#: builtin/add.c:309 builtin/update-index.c:965
 msgid "override the executable bit of the listed files"
 msgstr "passa per alt el bit executable dels fitxers llistats"
 
-#: builtin/add.c:290
+#: builtin/add.c:311
 msgid "warn when adding an embedded repository"
 msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
 
-#: builtin/add.c:305
+#: builtin/add.c:326
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4975,47 +5096,46 @@ msgstr ""
 "\n"
 "Vegeu \"git help submodule\" per a més informació."
 
-#: builtin/add.c:333
+#: builtin/add.c:354
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "s'està afegint un dipòsit incrustat: %s"
 
-#: builtin/add.c:351
+#: builtin/add.c:372
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Useu -f si realment els voleu afegir.\n"
 
-#: builtin/add.c:359
+#: builtin/add.c:380
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:396
+#: builtin/add.c:417
 msgid "-A and -u are mutually incompatible"
 msgstr "-A i -u són mútuament incompatibles"
 
-#: builtin/add.c:403
+#: builtin/add.c:424
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
 
-#: builtin/add.c:407
+#: builtin/add.c:428
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
 
-#: builtin/add.c:422
+#: builtin/add.c:443
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:423
+#: builtin/add.c:444
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Potser volíeu dir «git add .»?\n"
 
-#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
-#: builtin/submodule--helper.c:243
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 builtin/diff-tree.c:114
+#: builtin/mv.c:144 builtin/reset.c:241 builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "fitxer d'índex malmès"
 
@@ -5042,87 +5162,82 @@ msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:786
+#: builtin/am.c:790
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no s'ha pogut analitzar el pedaç «%s»"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
 
-#: builtin/am.c:899
+#: builtin/am.c:903
 msgid "invalid timestamp"
 msgstr "marca de temps no vàlida"
 
-#: builtin/am.c:904 builtin/am.c:916
+#: builtin/am.c:908 builtin/am.c:920
 msgid "invalid Date line"
 msgstr "línia Date no vàlida"
 
-#: builtin/am.c:911
+#: builtin/am.c:915
 msgid "invalid timezone offset"
 msgstr "desplaçament de zona de temps no vàlid"
 
-#: builtin/am.c:1004
+#: builtin/am.c:1008
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:1009 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "s'ha produït un error en crear el directori «%s»"
 
-#: builtin/am.c:1013
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1142 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "no s'ha pogut escriure el fitxer d'índex"
 
-#: builtin/am.c:1193
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
 
-#: builtin/am.c:1194
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
-"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
+msgstr "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
 
-#: builtin/am.c:1195
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr ""
-"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
-"\"."
+msgstr "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort\"."
 
-#: builtin/am.c:1302
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "El pedaç està buit."
 
-#: builtin/am.c:1368
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "línia d'identitat no vàlida: %.*s"
 
-#: builtin/am.c:1390
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: builtin/am.c:1584
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
-"vies."
+msgstr "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 vies."
 
-#: builtin/am.c:1586
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
 
-#: builtin/am.c:1605
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5130,38 +5245,28 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1611
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
 
-#: builtin/am.c:1636
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "S'ha produït un error en fusionar els canvis."
 
-#: builtin/am.c:1660 builtin/merge.c:641
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree ha fallat en escriure un arbre"
-
-#: builtin/am.c:1667
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
-#: builtin/merge.c:849
-msgid "failed to write commit object"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
-
-#: builtin/am.c:1713 builtin/am.c:1717
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1733
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
+msgstr "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
 
-#: builtin/am.c:1738
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "El cos de la comissió és:"
 
@@ -5169,37 +5274,34 @@ msgstr "El cos de la comissió és:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1748
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr ""
-"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
-"tots: "
+msgstr "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots: "
 
-#: builtin/am.c:1798
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndex brut: no es poden aplicar pedaços (bruts: %s)"
 
-#: builtin/am.c:1838 builtin/am.c:1910
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'està aplicant: %.*s"
 
-#: builtin/am.c:1854
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1862
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1868
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "La còpia del pedaç que ha fallat es troba en: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
 
-#: builtin/am.c:1913
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5209,29 +5311,27 @@ msgstr ""
 "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
 "introduït els mateixos canvis; potser voleu ometre aquest pedaç."
 
-#: builtin/am.c:1920
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
+"You should 'git add' each file with resolved conflicts to mark them as such.\n"
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 "Encara teniu camins sense fusionar a l'índex.\n"
-"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los "
-"com a tal.\n"
+"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com a tal.\n"
 "Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel fitxer."
 
-#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No s'ha pogut analitzar l'objecte «%s»."
 
-#: builtin/am.c:2081
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "s'ha produït un error en netejar l'índex"
 
-#: builtin/am.c:2116
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5239,135 +5339,140 @@ msgstr ""
 "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
 "No s'està rebobinant a ORIG_HEAD"
 
-#: builtin/am.c:2179
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor no vàlid per a --patch-format: %s"
 
-#: builtin/am.c:2212
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2219
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2223
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
 
-#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 builtin/repack.c:182
 msgid "be quiet"
 msgstr "silenciós"
 
-#: builtin/am.c:2226
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2231
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa l'indicador -k a git-mailinfo"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa l'indicador -b a git-mailinfo"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa l'indicador -m a git-mailinfo"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr ""
-"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
+msgstr "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
 
-#: builtin/am.c:2243
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
-#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
-#: builtin/am.c:2272
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "passa-ho a través de git-apply"
 
-#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
-#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 builtin/show-branch.c:631
+#: builtin/show-ref.c:169 builtin/tag.c:382 parse-options.h:144 parse-options.h:146
+#: parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/replace.c:445
+#: builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2269
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
-msgstr ""
-"passa per alt el missatge d'error si falla l'aplicació del pedaç"
+msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
 
-#: builtin/am.c:2277
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaços després de resoldre un conflicte"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2286
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr "restaura la branca original i avorta l'operació d'apedaçament."
 
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+
 #: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "mostra el pedaç que s'està aplicant."
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "usa el marc de temps actual per la data d'autor"
 
-#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 builtin/pull.c:178
+#: builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2298
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(ús intern per a git-rebase)"
 
-#: builtin/am.c:2316
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5375,18 +5480,16 @@ msgstr ""
 "Fa molt que l'opció -b/--binary no ha fet res, i\n"
 "s'eliminarà. No l'useu més."
 
-#: builtin/am.c:2323
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "S'ha produït un error en llegir l'índex"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
-msgstr ""
-"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
-"bústia."
+msgstr "un directori de «rebase» anterior %s encara existeix però s'ha donat una bústia."
 
-#: builtin/am.c:2362
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5395,7 +5498,7 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu \"git am --abort\" per a eliminar-lo."
 
-#: builtin/am.c:2368
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operació de resolució no està en curs; no reprenem."
 
@@ -5417,8 +5520,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: Remot sense URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: s'esperava ACK/NAK, s'ha rebut EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5433,18 +5536,69 @@ msgstr "git archive: error de protocol"
 msgid "git archive: expected a flush"
 msgstr "git archive: s'esperava una neteja"
 
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
 msgid "git bisect--helper --next-all [--no-checkout]"
 msgstr "git bisect--helper --next-all [--no-checkout]"
 
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "«%s» no és una terme vàlid"
+
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "no es pot usar l'ordre interna «%s» com a terme"
+
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "no es pot canviar el significat del terme «%s»"
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr "useu dos termes distintes"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "no s'ha pogut obrir el BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
 msgid "perform 'git bisect next'"
 msgstr "realitza 'git bisect next'"
 
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "escriu els termes a .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "neteja l'estat de la bisecció"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "comprova les revisions esperades"
+
+#: builtin/bisect--helper.c:128
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"
 
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms requereix dos paràmetres"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
 #: builtin/blame.c:27
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
@@ -5453,116 +5607,109 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr ""
-"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
-"desactivat)"
+msgstr "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: desactivat)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr ""
-"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
+msgstr "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Mostra les estadístiques de preu de treball"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Força l'informe de progrés"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Mostra la puntuació de sortida de les entrades «blame»"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostra el número de línia original (Per defecte: desactivat)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Presenta en un format dissenyat per consumpció per màquina"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostra el format de porcellana amb informació de comissió per línia"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr ""
-"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
+msgstr "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
-msgstr ""
-"Mostra l'adreça electrònica de l'autor en lloc del nom (Per "
-"defecte: desactivat)"
+msgstr "Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: desactivat)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "Ignora les diferències d'espai en blanc"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Usa un heurístic experimental per a millorar les diferències"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "Gasta cicles extres per a trobar una coincidència millor"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Usa els continguts de <fitxer> com a la imatge final"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "puntuació"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "Troba còpies de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "Troba moviments de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "Processa només el rang de línies n,m, comptant des d'1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr ""
-"no es pot usar --progress amb els formats --incremental o de porcellana"
+msgstr "no es pot usar --progress amb els formats --incremental o de porcellana"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -5572,18 +5719,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "el fitxer %s té només %lu línia"
 msgstr[1] "el fitxer %s té només %lu línies"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "S'està fent un «blame»"
 
@@ -5710,55 +5857,52 @@ msgstr "S'està fent «rebase» en la branca %s a %s"
 msgid "Branch %s is being bisected at %s"
 msgstr "La branca %s s'està bisecant a %s"
 
-#: builtin/branch.c:470
+#: builtin/branch.c:471
 msgid "cannot copy the current branch while not on any."
 msgstr "no es pot copiar branca actual mentre no s'és a cap."
 
-#: builtin/branch.c:472
+#: builtin/branch.c:473
 msgid "cannot rename the current branch while not on any."
 msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
 
-#: builtin/branch.c:483
+#: builtin/branch.c:484
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branca no vàlid: «%s»"
 
-#: builtin/branch.c:504
+#: builtin/branch.c:511
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:513
 msgid "Branch copy failed"
 msgstr "La còpia de la branca ha fallat"
 
-#: builtin/branch.c:510
+#: builtin/branch.c:517
 #, c-format
-msgid "Copied a misnamed branch '%s' away"
-msgstr "S'ha copiat el nom de la branca mal anomenada «%s»"
+msgid "created a copy of a misnamed branch '%s'"
+msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
 
-#: builtin/branch.c:513
+#: builtin/branch.c:520
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
 
-#: builtin/branch.c:519
+#: builtin/branch.c:526
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
 
-#: builtin/branch.c:528
+#: builtin/branch.c:535
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
-"La branca està canviada de nom, però l'actualització del fitxer de "
-"configuració ha fallat"
+"La branca està canviada de nom, però l'actualització del fitxer de configuració ha fallat"
 
-#: builtin/branch.c:530
+#: builtin/branch.c:537
 msgid "Branch is copied, but update of config-file failed"
-msgstr ""
-"La branca està copiada, però l'actualització del fitxer de configuració ha "
-"fallat"
+msgstr "La branca està copiada, però l'actualització del fitxer de configuració ha fallat"
 
-#: builtin/branch.c:546
+#: builtin/branch.c:553
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5769,230 +5913,219 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb '%c'.\n"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:586
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:588
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:589
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:583
+#: builtin/branch.c:590
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configura el mode de seguiment (vegeu git-pull(1))"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:592
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:594
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:594
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:595
 msgid "Unset the upstream info"
 msgstr "Desassigna la informació de font"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:596
 msgid "use colored output"
 msgstr "usa sortida colorada"
 
-#: builtin/branch.c:590
+#: builtin/branch.c:597
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: builtin/branch.c:592 builtin/branch.c:594
+#: builtin/branch.c:599 builtin/branch.c:601
 msgid "print only branches that contain the commit"
 msgstr "imprimeix només les branques que continguin la comissió"
 
-#: builtin/branch.c:593 builtin/branch.c:595
+#: builtin/branch.c:600 builtin/branch.c:602
 msgid "print only branches that don't contain the commit"
 msgstr "imprimeix només les branques que no continguin la comissió"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:605
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:599
+#: builtin/branch.c:606
 msgid "list both remote-tracking and local branches"
 msgstr "llista les branques amb seguiment remot i les locals"
 
-#: builtin/branch.c:601
+#: builtin/branch.c:608
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:602
+#: builtin/branch.c:609
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:603
+#: builtin/branch.c:610
 msgid "move/rename a branch and its reflog"
 msgstr "mou/canvia de nom una branca i el seu registre de referència"
 
-#: builtin/branch.c:604
+#: builtin/branch.c:611
 msgid "move/rename a branch, even if target exists"
 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:605
+#: builtin/branch.c:612
 msgid "copy a branch and its reflog"
 msgstr "copia una branca i el seu registre de referència"
 
-#: builtin/branch.c:606
+#: builtin/branch.c:613
 msgid "copy a branch, even if target exists"
 msgstr "copia una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:607
+#: builtin/branch.c:614
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:608
+#: builtin/branch.c:615
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:610
+#: builtin/branch.c:617
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:611
+#: builtin/branch.c:618
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:612
+#: builtin/branch.c:619
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:613
+#: builtin/branch.c:620
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
-#: builtin/branch.c:614
+#: builtin/branch.c:621
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "clau"
 
-#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "nom del camp en el qual ordenar"
 
-#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
-#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 builtin/notes.c:411
+#: builtin/notes.c:571 builtin/notes.c:574 builtin/tag.c:414
 msgid "object"
 msgstr "objecte"
 
-#: builtin/branch.c:619
+#: builtin/branch.c:626
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format a usar en la sortida"
 
-#: builtin/branch.c:645 builtin/clone.c:729
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "--column and --verbose are incompatible"
 msgstr "--column i --verbose són incompatibles"
 
-#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
 msgid "branch name required"
 msgstr "cal el nom de branca"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:718
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:713
+#: builtin/branch.c:723
 msgid "cannot edit description of more than one branch"
 msgstr "no es pot editar la descripció de més d'una branca"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:730
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Encara no hi ha cap comissió en la branca «%s»."
 
-#: builtin/branch.c:723
+#: builtin/branch.c:733
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hi ha cap branca amb nom «%s»."
 
-#: builtin/branch.c:738
+#: builtin/branch.c:748
 msgid "too many branches for a copy operation"
 msgstr "hi ha massa branques per a una operació de còpia"
 
-#: builtin/branch.c:747
+#: builtin/branch.c:757
 msgid "too many arguments for a rename operation"
 msgstr "hi ha massa arguments per a una operació remota"
 
-#: builtin/branch.c:752
+#: builtin/branch.c:762
 msgid "too many arguments to set new upstream"
 msgstr "hi ha massa arguments per a establir una nova font"
 
-#: builtin/branch.c:756
+#: builtin/branch.c:766
 #, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr ""
-"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
+msgid "could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
 
-#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hi ha tal branca «%s»"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:773
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branca «%s» no existeix"
 
-#: builtin/branch.c:775
+#: builtin/branch.c:785
 msgid "too many arguments to unset upstream"
 msgstr "hi ha massa arguments per a desassignar la font"
 
-#: builtin/branch.c:779
+#: builtin/branch.c:789
 msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr ""
-"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
+msgstr "no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
 
-#: builtin/branch.c:785
+#: builtin/branch.c:795
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branca «%s» no té informació de font"
 
-#: builtin/branch.c:797
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "no té sentit crear 'HEAD' manualment"
-
-#: builtin/branch.c:803
+#: builtin/branch.c:810
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr ""
-"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
+msgstr "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
 
-#: builtin/branch.c:806
+#: builtin/branch.c:813
 msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+"the '--set-upstream' option is no longer supported. Please use '--track' or '--set-"
+"upstream-to' instead."
 msgstr ""
-"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
-"upstream-to."
+"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-upstream-to."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -6007,82 +6140,76 @@ msgstr "Cal un dipòsit per a fer un farcell."
 msgid "Need a repository to unbundle."
 msgstr "Cal un dipòsit per a desfer un farcell."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | "
+"--textconv | --filters) [--path=<path>] <object>"
 msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <tipus> "
+"| --textconv | --filters [--path=<camí>]) <objecte>"
 
-#: builtin/cat-file.c:522
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: builtin/cat-file.c:524
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
 msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "mostra el tipus de l'objecte"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "surt amb zero quan no hi ha error"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "imprimeix bellament el contingut de l'objecte"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
-msgstr ""
-"en els objectes de blob, executa els filtres en el contingut de l'objecte"
+msgstr "en els objectes de blob, executa els filtres en el contingut de l'objecte"
 
-#: builtin/cat-file.c:569 git-submodule.sh:943
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un camí específic per a --textconv/--filters"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memòria intermèdia"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
-msgstr ""
-"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
+msgstr "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr ""
-"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
+msgstr "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostra tots els objectes amb --batch o --batch-check"
 
@@ -6102,7 +6229,7 @@ msgstr "informa de tots els atributs establerts en el fitxer"
 msgid "use .gitattributes only from the index"
 msgstr "usa .gitattributes només des de l'índex"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "llegeix els noms de fitxer de stdin"
 
@@ -6110,7 +6237,7 @@ msgstr "llegeix els noms de fitxer de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrés"
 
@@ -6122,27 +6249,27 @@ msgstr "mostra els camins d'entrada que no coincideixin"
 msgid "ignore index when checking"
 msgstr "ignora l'índex en comprovar"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "no es poden especificar noms de camí amb --stdin"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z només té sentit amb --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "cap camí especificat"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet només és vàlid amb un sol nom de camí"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "no es poden especificar --quiet i --verbose alhora"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching és vàlid només amb --verbose"
 
@@ -6167,83 +6294,81 @@ msgstr "no hi ha contactes especificats"
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
 msgid "stage should be between 1 and 3 or all"
 msgstr "«stage» ha de ser entre 1 i 3 o all"
 
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
 msgid "check out all files in the index"
 msgstr "agafa tots els fitxers en l'índex"
 
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
 msgid "force overwrite of existing files"
 msgstr "força la sobreescriptura de fitxers existents"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
 msgid "no warning for existing files and files not in index"
-msgstr ""
-"cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
+msgstr "cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
 
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:164
 msgid "don't checkout new files"
 msgstr "no agafis fitxers nous"
 
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
 msgid "update stat information in the index file"
 msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
 
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
 msgid "read list of paths from the standard input"
 msgstr "llegeix la llista de camins des de l'entrada estàndard"
 
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
 msgid "write the content to temporary files"
 msgstr "escriu el contingut a fitxers temporals"
 
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
-#: builtin/worktree.c:498
+#: builtin/checkout-index.c:173 builtin/column.c:31 builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1206 builtin/submodule--helper.c:1212
+#: builtin/submodule--helper.c:1574 builtin/worktree.c:570
 msgid "string"
 msgstr "cadena"
 
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
 msgid "when creating files, prepend <string>"
 msgstr "en crear fitxers, anteposa <cadena>"
 
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
 msgid "copy out the files from named stage"
 msgstr "copia els fitxers des de «stage» amb nom"
 
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opcions>] <branca>"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
 
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "el camí «%s» no té la nostra versió"
 
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "el camí «%s» no té la seva versió"
 
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "el camí «%s» no té totes les versions necessàries"
 
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "el camí «%s» no té les versions necessàries"
 
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "camí «%s»: no es pot fusionar"
@@ -6267,62 +6392,61 @@ msgstr "«%s» no es pot usar amb %s"
 #: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr ""
-"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
+msgstr "No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
 
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "el camí «%s» està sense fusionar"
 
-#: builtin/checkout.c:501
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre índex actual"
 
-#: builtin/checkout.c:632
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No es pot fer reflog per a «%s»: %s\n"
 
-#: builtin/checkout.c:673
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:677 builtin/clone.c:683
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:681
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca «%s»\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ja en «%s»\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "S'ha canviat i restablert a la branca «%s»\n"
 
-#: builtin/checkout.c:690 builtin/checkout.c:1086
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "S'ha canviat a la branca nova «%s»\n"
 
-#: builtin/checkout.c:692
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca «%s»\n"
 
-#: builtin/checkout.c:743
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:749
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6345,7 +6469,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:768
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6372,160 +6496,159 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:809
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:813
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:843 builtin/checkout.c:1081
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de néixer"
 
-#: builtin/checkout.c:987
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava només una referència, s'han donat %d."
 
-#: builtin/checkout.c:1027 builtin/worktree.c:233
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referència no vàlida: %s"
 
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referència no és un arbre: %s"
 
-#: builtin/checkout.c:1095
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1098 builtin/checkout.c:1102
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "«%s» no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
-#: builtin/checkout.c:1117
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» no es pot usar amb «%s»"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No es pot canviar la branca a la no comissió «%s»"
 
-#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
-#: builtin/worktree.c:348
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 builtin/remote.c:166
+#: builtin/remote.c:168 builtin/worktree.c:387 builtin/worktree.c:389
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "crea un registre de referència per a la branca nova"
 
-#: builtin/checkout.c:1159 builtin/worktree.c:350
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "estableix la informació de font de la branca nova"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusió de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1169 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1171
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "estil de conflicte (fusió o diff3)"
 
-#: builtin/checkout.c:1174
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camí només a entrades disperses"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "dubta 'git checkout <cap-branca-així>'"
 
-#: builtin/checkout.c:1178
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr "no comprovis si altre arbre de treball té la referència donada"
 
-#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
-#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
-#: builtin/send-pack.c:173
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 builtin/merge.c:236
+#: builtin/pull.c:123 builtin/push.c:556 builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "força l'informe de progrés"
 
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B i --orphan són mutualment exclusius"
+msgstr "-b, -B i --orphan són mútuament excloents"
 
-#: builtin/checkout.c:1229
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1234
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Manca el nom de branca; proveu -b"
 
-#: builtin/checkout.c:1270
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta comissió"
+msgstr ""
+"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta comissió"
 
-#: builtin/checkout.c:1281
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
 
-#: builtin/checkout.c:1285
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6534,10 +6657,8 @@ msgstr ""
 "agafar de l'índex."
 
 #: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
+msgid "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
 
 #: builtin/clean.c:30
 #, c-format
@@ -6564,7 +6685,7 @@ msgstr "Ometria el dipòsit %s\n"
 msgid "failed to remove %s"
 msgstr "s'ha produït un error en eliminar %s"
 
-#: builtin/clean.c:301 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6577,7 +6698,7 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6598,38 +6719,37 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
+#: builtin/clean.c:522 git-add--interactive.perl:547 git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Perdó (%s)?\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:664
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:701
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:722
 msgid "Select items to delete"
 msgstr "Selecciona els ítems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:763
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Adeu.\n"
 
-#: builtin/clean.c:795
+#: builtin/clean.c:796
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6647,214 +6767,208 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** Ordres ***"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "I ara què"
 
-#: builtin/clean.c:831
+#: builtin/clean.c:832
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Eliminaria l'ítem següent:"
 msgstr[1] "Eliminaria els ítems següents:"
 
-#: builtin/clean.c:847
+#: builtin/clean.c:848
 msgid "No more files to clean, exiting."
 msgstr "No hi ha més fitxers a netejar; s'està sortint."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:910
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:912
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:913
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:915
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
-#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 builtin/grep.c:871
+#: builtin/log.c:157 builtin/log.c:159 builtin/ls-files.c:548 builtin/name-rev.c:397
 #: builtin/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:917
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:918
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:920
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:937
+#: builtin/clean.c:938
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
-#: builtin/clean.c:941
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: builtin/clean.c:942
+msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean"
 msgstr ""
-"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han "
-"indicat; refusant netejar"
+"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; refusant "
+"netejar"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:945
 msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean"
 msgstr ""
-"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
-"refusant netejar"
+"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; refusant netejar"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "no facis cap agafament"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "crea un dipòsit nu"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "crea un dipòsit mirall (implica bare)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "per a clonar des d'un dipòsit local"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "no usis enllaços durs locals, sempre copia"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "configura com a dipòsit compartit"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "especificació de camí"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "inicialitza els submòduls en el clon"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de submòduls clonats en paral·lel"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "directori-de-plantilla"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "directori des del qual s'usaran les plantilles"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
-#: builtin/submodule--helper.c:1002
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "dipòsit de referència"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "usa --reference només en clonar"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "agafa <branca> en lloc del HEAD del remot"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "camí a git-upload-pack en el remot"
 
-#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
-#: builtin/pull.c:205
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 builtin/pull.c:211
 msgid "depth"
 msgstr "profunditat"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial de tal profunditat"
 
-#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 parse-options.h:154
 msgid "time"
 msgstr "hora"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una hora específica"
 
-#: builtin/clone.c:122 builtin/fetch.c:141
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "revisió"
 
-#: builtin/clone.c:123 builtin/fetch.c:142
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona només una branca, HEAD o --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "qualsevol submòdul clonat serà superficial"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "directori de git"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "separa el directori de git de l'arbre de treball"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "clau=valor"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "estableix la configuració dins del dipòsit nou"
 
-#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "usa només adreces IPv4"
 
-#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "usa només adreces IPv6"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6862,42 +6976,42 @@ msgstr ""
 "No s'ha pogut endevinar cap nom de directori.\n"
 "Especifiqueu un directori en la línia d'ordres"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "s'ha produït un error en obrir «%s»"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "s'ha produït un error en fer stat a '%s'\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "s'ha produït un error en crear l'enllaç «%s»"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "s'ha produït un error en copiar el fitxer a «%s»"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:483
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6908,141 +7022,133 @@ msgstr ""
 "'git status' i tornar a intentar l'agafament amb\n"
 "'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:560
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
 
-#: builtin/clone.c:655
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "el remot no ha enviat tots els objectes necessaris"
 
-#: builtin/clone.c:671
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: builtin/clone.c:720
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
-"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
-"agafar.\n"
+"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut agafar.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1944
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "Hi ha massa paràmetres."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "Heu d'especificar un dipòsit per a clonar."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les opcions --bare i --origin %s són incompatibles."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare i --separate-git-dir són incompatibles."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "el dipòsit «%s» no existeix"
 
-#: builtin/clone.c:933 builtin/fetch.c:1360
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profunditat %s no és nombre positiu"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "el camí destí «%s» ja existeix i no és un directori buit."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball «%s» ja existeix."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:240 builtin/worktree.c:270
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 builtin/worktree.c:255
+#: builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no s'han pogut crear els directoris inicials de «%s»"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "S'està clonant al dipòsit nu «%s»...\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "S'està clonant a «%s»...\n"
 
-#: builtin/clone.c:1009
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
-msgstr ""
-"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
-"able"
+#: builtin/clone.c:1031
+msgid "clone --recursive is not compatible with both --reference and --reference-if-able"
+msgstr "clone --recursive no és compatible amb ambdós --reference i --reference-if-able"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr ""
-"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
+msgstr "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr ""
-"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
+msgstr "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
+
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "el dipòsit font és superficial, s'està ignorant --local"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1087
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "No se sap com clonar %s"
-
-#: builtin/clone.c:1142 builtin/clone.c:1150
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branca remota %s no es troba en la font %s"
 
-#: builtin/clone.c:1153
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembla que heu clonat un dipòsit buit."
 
@@ -7078,68 +7184,15 @@ msgstr "Espai d'encoixinada entre columnes"
 msgid "--command must be the first argument"
 msgstr "--command ha de ser el primer paràmetre"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"S'han configurat el vostre nom i adreça electrònica\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
-"Comproveu que siguin correctes. Podeu suprimir aquest\n"
-"missatge establint-los explícitament. Executeu l'ordre següent i\n"
-"seguiu les instruccions en el vostre editor per editar el vostre\n"
-"fitxer de configuració:\n"
-"\n"
-"    git config --global --edit\n"
-"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
-"comissió amb:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"S'han configurat el vostre nom i adreça electrònica\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
-"Comproveu que siguin correctes. Podeu suprimir aquest\n"
-"missatge establint-los explícitament:\n"
-"\n"
-"    git config --global user.name \"El Vostre Nom\"\n"
-"    git config --global user.email tu@example.com\n"
-"\n"
-"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
-"comissió amb:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7149,7 +7202,7 @@ msgstr ""
 "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
 "podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7157,18 +7210,17 @@ msgid ""
 "    git commit --allow-empty\n"
 "\n"
 msgstr ""
-"El «cherry pick» previ ja està buit, possiblement a causa de resolució de "
-"conflicte.\n"
+"El «cherry pick» previ ja està buit, possiblement a causa de resolució de conflicte.\n"
 "Si el voleu cometre de totes maneres, useu:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "D'altra manera, useu «git reset»\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7184,61 +7236,61 @@ msgstr ""
 "Llavors \"git cherry-pick --continue\" reprendrà\n"
 "com a «cherry pick» les comissions restants.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un índex temporal"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'índex temporal"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissió parcial durant una fusió."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "no es pot llegir l'índex"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "a la comissió «%s» li manca la capçalera d'autor"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "la comissió «%s» té una línia d'autor mal formada"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "paràmetre --author mal format"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7246,38 +7298,38 @@ msgstr ""
 "no es pot seleccionar un caràcter de comentari que\n"
 "no sigui usat en el missatge de comissió actual"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no s'ha pogut trobar la comissió %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7292,7 +7344,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7307,7 +7359,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7317,7 +7369,7 @@ msgstr ""
 "S'ignoraran les línies començant amb '%c', i un missatge de\n"
 "comissió buit avorta la comissió.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7325,356 +7377,343 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 "Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb '%c'; podeu eliminar-les "
-"vosaltres\n"
+"Es mantindran les línies que comencin amb '%c'; podeu eliminar-les vosaltres\n"
 "mateixos si voleu. Un missatge buit avorta la comissió.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
-#: builtin/commit.c:958
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Error en construir arbres"
 
-#: builtin/commit.c:972 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
 
-#: builtin/commit.c:1075
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
 "cap autor existent"
 
-#: builtin/commit.c:1090 builtin/commit.c:1335
+#: builtin/commit.c:1000
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "mode ignorat no vàlid «%s»"
+
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fitxers no seguits no vàlid «%s»"
 
-#: builtin/commit.c:1128
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "--long i -z són incompatibles"
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambdós --reset-author i --author no té sentit"
 
-#: builtin/commit.c:1167
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1170
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les opcions --squash i --fixup no es poden usar juntes"
 
-#: builtin/commit.c:1185
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Només un de -c/-C/-F/--fixup es pot usar."
 
-#: builtin/commit.c:1187
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
 
-#: builtin/commit.c:1195
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author només es pot usar amb -C, -c o --amend."
 
-#: builtin/commit.c:1212
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
 
-#: builtin/commit.c:1214
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only no té sentit sense camí."
 
-#: builtin/commit.c:1226 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vàlid %s"
 
-#: builtin/commit.c:1231
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "-a no té sentit amb camins."
 
-#: builtin/commit.c:1349 builtin/commit.c:1626
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1351 builtin/commit.c:1628
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1353
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "mostra la informació de «stash»"
 
-#: builtin/commit.c:1355
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
-#: builtin/worktree.c:469
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "sortida llegible per màquina"
 
-#: builtin/commit.c:1358 builtin/commit.c:1632
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "mostra l'estat en format llarg (per defecte)"
 
-#: builtin/commit.c:1361 builtin/commit.c:1635
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
-#: builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1364 builtin/commit.c:1638
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
-"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
-"defecte: all)"
+"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per defecte: all)"
 
-#: builtin/commit.c:1367
-msgid "show ignored files"
-msgstr "mostra els fitxers ignorats"
+#: builtin/commit.c:1299
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: traditional)"
+msgstr ""
+"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. (Per defecte: "
+"traditional, matching, no.)"
 
-#: builtin/commit.c:1368 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1369
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: builtin/commit.c:1302
+msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"
 msgstr ""
-"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
-"defecte: all)"
+"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per defecte: all)"
 
-#: builtin/commit.c:1371
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1449
-msgid "couldn't look up newly created commit"
-msgstr "no s'ha pogut trobar la comissió novament creada"
-
-#: builtin/commit.c:1451
-msgid "could not parse newly created commit"
-msgstr "no s'ha pogut analitzar la comissió novament creada"
-
-#: builtin/commit.c:1496
-msgid "detached HEAD"
-msgstr "HEAD separat"
-
-#: builtin/commit.c:1499
-msgid " (root-commit)"
-msgstr " (comissió d'arrel)"
+#: builtin/commit.c:1323
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "mostra la diferència en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1600 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "autor corregit de la comissió"
 
-#: builtin/commit.c:1602 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "data corregida de la comissió"
 
-#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 builtin/notes.c:565
+#: builtin/tag.c:391
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "missatge de comissió"
 
-#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
-#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 builtin/commit.c:1424
+#: parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "comissió"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "reusa i edita el missatge de la comissió especificada"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "reusa el missatge de la comissió especificada"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
-"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
-"especificada"
+"usa el missatge formatat de «squash» automàtic per a corregir la comissió especificada"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
-"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
-"especificada"
+"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió especificada"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "l'autor de la comissió ja soc jo (s'usa amb -C/-c/--amend)"
 
-#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 builtin/pull.c:149
 #: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "afegeix Signed-off-by:"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "per defecte"
 
-#: builtin/commit.c:1612 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "inclou l'estat en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
-#: builtin/revert.c:113
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "signa la comissió amb GPG"
 
-#: builtin/commit.c:1618
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Opcions dels continguts de les comissions"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "afegeix els fitxers especificats a l'índex per a cometre"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evita els lligams de precomissió i missatge de comissió"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "evita el lligam de post escriptura"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "està bé registrar un canvi amb missatge buit"
 
-#: builtin/commit.c:1674
-msgid "could not parse HEAD commit"
-msgstr "no s'ha pogut analitzar la comissió HEAD"
-
-#: builtin/commit.c:1719
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1726
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1745
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: builtin/commit.c:1756
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
 
-#: builtin/commit.c:1761
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
 
-#: builtin/commit.c:1809
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7689,142 +7728,144 @@ msgstr ""
 msgid "git config [<options>]"
 msgstr "git config [<opcions>]"
 
-#: builtin/config.c:57
+#: builtin/config.c:58
 msgid "Config file location"
 msgstr "Ubicació del fitxer de configuració"
 
-#: builtin/config.c:58
+#: builtin/config.c:59
 msgid "use global config file"
 msgstr "usa el fitxer de configuració global"
 
-#: builtin/config.c:59
+#: builtin/config.c:60
 msgid "use system config file"
 msgstr "usa el fitxer de configuració del sistema"
 
-#: builtin/config.c:60
+#: builtin/config.c:61
 msgid "use repository config file"
 msgstr "usa el fitxer de configuració del dipòsit"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "use given config file"
 msgstr "usa el fitxer de configuració donat"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "blob-id"
 msgstr "ID de blob"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "read config from given blob object"
 msgstr "llegeix la configuració de l'objecte de blob donat"
 
-#: builtin/config.c:63
+#: builtin/config.c:64
 msgid "Action"
 msgstr "Acció"
 
-#: builtin/config.c:64
+#: builtin/config.c:65
 msgid "get value: name [value-regex]"
 msgstr "obtén valor: nom [regex-de-valors]"
 
-#: builtin/config.c:65
+#: builtin/config.c:66
 msgid "get all values: key [value-regex]"
 msgstr "obtén tots els valors: clau [regex-de-valors]"
 
-#: builtin/config.c:66
+#: builtin/config.c:67
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
 
-#: builtin/config.c:67
+#: builtin/config.c:68
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtén el valor específic per a l'URL: secció[.variable] URL"
 
-#: builtin/config.c:68
+#: builtin/config.c:69
 msgid "replace all matching variables: name value [value_regex]"
-msgstr ""
-"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
+msgstr "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
 
-#: builtin/config.c:69
+#: builtin/config.c:70
 msgid "add a new variable: name value"
 msgstr "afegeix una variable nova: nom valor"
 
-#: builtin/config.c:70
+#: builtin/config.c:71
 msgid "remove a variable: name [value-regex]"
 msgstr "elimina una variable: nom [regex-de-valors]"
 
-#: builtin/config.c:71
+#: builtin/config.c:72
 msgid "remove all matches: name [value-regex]"
 msgstr "elimina totes les coincidències: nom [regex-de-valors]"
 
-#: builtin/config.c:72
+#: builtin/config.c:73
 msgid "rename section: old-name new-name"
 msgstr "canvia el nom de secció: nom-antic nom-nou"
 
-#: builtin/config.c:73
+#: builtin/config.c:74
 msgid "remove a section: name"
 msgstr "elimina una secció: nom"
 
-#: builtin/config.c:74
+#: builtin/config.c:75
 msgid "list all"
 msgstr "llista tots"
 
-#: builtin/config.c:75
+#: builtin/config.c:76
 msgid "open an editor"
 msgstr "obre un editor"
 
-#: builtin/config.c:76
+#: builtin/config.c:77
 msgid "find the color configured: slot [default]"
 msgstr "troba el color configurat: ranura [per defecte]"
 
-#: builtin/config.c:77
+#: builtin/config.c:78
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
 
-#: builtin/config.c:78
+#: builtin/config.c:79
 msgid "Type"
 msgstr "Tipus"
 
-#: builtin/config.c:79
+#: builtin/config.c:80
 msgid "value is \"true\" or \"false\""
 msgstr "el valor és \"true\" o \"false\""
 
-#: builtin/config.c:80
+#: builtin/config.c:81
 msgid "value is decimal number"
 msgstr "el valor és un nombre decimal"
 
-#: builtin/config.c:81
+#: builtin/config.c:82
 msgid "value is --bool or --int"
 msgstr "el valor és --bool o --int"
 
-#: builtin/config.c:82
+#: builtin/config.c:83
 msgid "value is a path (file or directory name)"
 msgstr "el valor és un camí (nom de fitxer o directori)"
 
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "el valor és una data de venciment"
+
+#: builtin/config.c:85
 msgid "Other"
 msgstr "Altre"
 
-#: builtin/config.c:84
+#: builtin/config.c:86
 msgid "terminate values with NUL byte"
 msgstr "acaba els valors amb un octet NUL"
 
-#: builtin/config.c:85
+#: builtin/config.c:87
 msgid "show variable names only"
 msgstr "mostra només els noms de variable"
 
-#: builtin/config.c:86
+#: builtin/config.c:88
 msgid "respect include directives on lookup"
 msgstr "respecta les directives d'inclusió en cercar"
 
-#: builtin/config.c:87
+#: builtin/config.c:89
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
-"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia "
-"d'ordres)"
+"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia d'ordres)"
 
-#: builtin/config.c:327
+#: builtin/config.c:335
 msgid "unable to parse default color value"
 msgstr "no s'ha pogut analitzar el valor de color per defecte"
 
-#: builtin/config.c:471
+#: builtin/config.c:479
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7839,16 +7880,16 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:499
+#: builtin/config.c:507
 msgid "--local can only be used inside a git repository"
 msgstr "--local només es pot usar dins d'un dipòsit git"
 
-#: builtin/config.c:624
+#: builtin/config.c:632
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no es pot crear el fitxer de configuració %s"
 
-#: builtin/config.c:637
+#: builtin/config.c:645
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7865,51 +7906,41 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "imprimeix les mides en un format llegible pels humans"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:22
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opcions>] [<comissió>...]"
 
-#: builtin/describe.c:20
+#: builtin/describe.c:23
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opcions>] --dirty"
 
-#: builtin/describe.c:54
+#: builtin/describe.c:57
 msgid "head"
 msgstr "davant per"
 
-#: builtin/describe.c:54
+#: builtin/describe.c:57
 msgid "lightweight"
 msgstr "lleuger"
 
-#: builtin/describe.c:54
+#: builtin/describe.c:57
 msgid "annotated"
 msgstr "anotat"
 
-#: builtin/describe.c:264
+#: builtin/describe.c:267
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'etiqueta anotada %s no és disponible"
 
-#: builtin/describe.c:268
+#: builtin/describe.c:271
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'etiqueta anotada %s no té nom incrustat"
 
-#: builtin/describe.c:270
+#: builtin/describe.c:273
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "l'etiqueta «%s» realment és «%s» aquí"
 
-#: builtin/describe.c:297 builtin/log.c:493
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "%s no és un nom d'objecte vàlid"
-
-#: builtin/describe.c:300
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de «%s» vàlid"
-
 #: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
@@ -7917,15 +7948,15 @@ msgstr "cap etiqueta coincideix exactament amb «%s»"
 
 #: builtin/describe.c:319
 #, c-format
-msgid "searching to describe %s\n"
-msgstr "s'està cercant per a descriure %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
 
 #: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "s'ha finalitzat la cerca a %s\n"
 
-#: builtin/describe.c:393
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7934,7 +7965,7 @@ msgstr ""
 "Cap etiqueta anotada pot descriure «%s».\n"
 "No obstant, hi havia etiquetes no anotades: proveu --tags."
 
-#: builtin/describe.c:397
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7943,12 +7974,12 @@ msgstr ""
 "Cap etiqueta pot descriure «%s».\n"
 "Proveu --always, o creeu algunes etiquetes."
 
-#: builtin/describe.c:427
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu comissions travessades\n"
 
-#: builtin/describe.c:430
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7957,75 +7988,90 @@ msgstr ""
 "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
 "s'ha renunciat la cerca a %s\n"
 
-#: builtin/describe.c:452
+#: builtin/describe.c:497
+#, c-format
+msgid "describe %s\n"
+msgstr "descriu %s\n"
+
+#: builtin/describe.c:500 builtin/log.c:502
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "%s no és un nom d'objecte vàlid"
+
+#: builtin/describe.c:508
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s no és una comissió o un blob"
+
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "troba l'etiqueta que vingui després de la comissió"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "estratègia de cerca de depuració en stderr"
 
-#: builtin/describe.c:454
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "usa qualsevol referència"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "sempre usa el format llarg"
 
-#: builtin/describe.c:457
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "només segueix la primera mare"
 
-#: builtin/describe.c:460
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "emet només coincidències exactes"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
 
-#: builtin/describe.c:464
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "només considera les etiquetes que coincideixen amb <patró>"
 
-#: builtin/describe.c:466
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
 
-#: builtin/describe.c:468 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
 
-#: builtin/describe.c:469 builtin/describe.c:472
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:470
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
 
-#: builtin/describe.c:473
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
 
-#: builtin/describe.c:491
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long és incompatible amb --abbrev=0"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "No s'ha trobat cap nom, no es pot descriure res."
 
-#: builtin/describe.c:563
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty és incompatible amb les comissions"
 
-#: builtin/describe.c:565
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken és incompatible amb les comissions"
 
@@ -8034,26 +8080,26 @@ msgstr "--broken és incompatible amb les comissions"
 msgid "'%s': not a regular file or symlink"
 msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:234
 #, c-format
 msgid "invalid option: %s"
 msgstr "opció no vàlida: %s"
 
-#: builtin/diff.c:357
+#: builtin/diff.c:356
 msgid "Not a git repository"
 msgstr "No és un dipòsit de git"
 
-#: builtin/diff.c:400
+#: builtin/diff.c:399
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "s'ha donat un objecte no vàlid «%s»."
 
-#: builtin/diff.c:409
+#: builtin/diff.c:408
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "s'ha donat més de dos blobs: «%s»"
 
-#: builtin/diff.c:414
+#: builtin/diff.c:413
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "s'ha donat l'objecte no gestionat «%s»."
@@ -8090,73 +8136,71 @@ msgstr ""
 "els formats de diff combinats ('-c' and '--cc') no són admesos \n"
 "en el mode diff per directoris ('-d' and '--dir-diff')."
 
-#: builtin/difftool.c:633
+#: builtin/difftool.c:632
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
 
-#: builtin/difftool.c:635
+#: builtin/difftool.c:634
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:645
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a %s'."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:695
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:697
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:699
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
 msgid "<tool>"
 msgstr "<tool>"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
 msgid "print a list of diff tools that may be used with `--tool`"
-msgstr ""
-"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
+msgstr "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
 
-#: builtin/difftool.c:713
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/difftool.c:712
+msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code"
 msgstr ""
-"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida diferent de zero"
+"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida "
+"diferent de zero"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:714
 msgid "<command>"
 msgstr "<command>"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
 msgid "specify a custom command for viewing diffs"
 msgstr "especifiqueu una ordre personalitzada per veure diffs"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:739
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
 
-#: builtin/difftool.c:747
+#: builtin/difftool.c:746
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
 
@@ -8212,185 +8256,186 @@ msgstr "Aplica l'especificació de referència a les referències exportades"
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:112 builtin/pull.c:182
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "obtén de tots els remots"
 
-#: builtin/fetch.c:114 builtin/pull.c:185
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:116 builtin/pull.c:188
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "camí al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:117 builtin/pull.c:190
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "força la sobreescriptura de la branca local"
 
-#: builtin/fetch.c:119
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "obtén de múltiples remots"
 
-#: builtin/fetch.c:121 builtin/pull.c:192
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "obtén totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:123
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:125
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submòduls obtinguts en paral·lel"
 
-#: builtin/fetch.c:127 builtin/pull.c:195
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
 
-#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:129
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/fetch.c:133 builtin/pull.c:203
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "retén el paquet baixat"
 
-#: builtin/fetch.c:135
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualització de la referència HEAD"
 
-#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la història d'un clon superficial"
 
-#: builtin/fetch.c:140
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la història d'un clon superficial basat en temps"
 
-#: builtin/fetch.c:146 builtin/pull.c:209
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "converteix en un dipòsit complet"
 
-#: builtin/fetch.c:148 builtin/log.c:1456
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "directori"
 
-#: builtin/fetch.c:149
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "anteposa això a la sortida de camí del submòdul"
 
-#: builtin/fetch.c:152
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: builtin/fetch.c:166
+msgid "default for recursive fetching of submodules (lower priority than config files)"
 msgstr ""
-"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que els fitxers de configuració)"
+"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que els fitxers "
+"de configuració)"
 
-#: builtin/fetch.c:156 builtin/pull.c:212
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referències que actualitzin .git/shallow"
 
-#: builtin/fetch.c:157 builtin/pull.c:214
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "mapa de referències"
 
-#: builtin/fetch.c:158 builtin/pull.c:215
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "mostra el mapa de referències d'obtenció"
 
-#: builtin/fetch.c:416
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "No s'ha pogut trobar la referència HEAD remota"
 
-#: builtin/fetch.c:534
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuració fetch.output conté un valor no vàlid %s"
 
-#: builtin/fetch.c:627
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:631
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:644 builtin/fetch.c:724
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:645
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:654
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[actualització d'etiqueta]"
 
-#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
-#: builtin/fetch.c:719
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referència local"
 
-#: builtin/fetch.c:674
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:677
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:680
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:724
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:769
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr ""
-"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
+msgstr "rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
 
-#: builtin/fetch.c:877 builtin/fetch.c:973
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:888
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8400,55 +8445,54 @@ msgstr ""
 " intenteu executar 'git remote prune %s' per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:943
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarà penjant)"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:976
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:977 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
 
-#: builtin/fetch.c:1019
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
 
-#: builtin/fetch.c:1022
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "S'ignora l'opció \"%s\" per a %s\n"
 
-#: builtin/fetch.c:1098
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "No se sap com obtenir de %s"
-
-#: builtin/fetch.c:1258
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1260 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No s'ha pogut obtenir %s"
 
-#: builtin/fetch.c:1278
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid "--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8456,66 +8500,64 @@ msgstr ""
 "Cap dipòsit remot especificat. Especifiqueu un URL o\n"
 "un nom remot del qual es deuen obtenir les revisions noves."
 
-#: builtin/fetch.c:1301
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Necessiteu especificar un nom d'etiqueta."
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "No s'admet una profunditat negativa en --deepen"
 
-#: builtin/fetch.c:1346
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen i --depth són mutualment exclusius"
+msgstr "--deepen i --depth són mútuament excloents"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth i --unshallow no es poden usar junts"
 
-#: builtin/fetch.c:1353
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow en un dipòsit complet no té sentit"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no accepta un paràmetre de dipòsit"
 
-#: builtin/fetch.c:1368
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no té sentit amb especificacions de referència"
 
-#: builtin/fetch.c:1379
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No hi ha tal remot ni tal grup remot: %s"
 
-#: builtin/fetch.c:1387
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Obtenir un grup i especificar referències no té sentit"
 
 #: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr ""
-"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
+msgid "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:665
+#: builtin/fmt-merge-msg.c:666
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
 
-#: builtin/fmt-merge-msg.c:668
+#: builtin/fmt-merge-msg.c:669
 msgid "alias for --log (deprecated)"
 msgstr "àlies per --log (en desús)"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:674
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
@@ -8533,13 +8575,11 @@ msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr ""
-"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
+msgstr "git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
 
 #: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
-msgstr ""
-"posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
+msgstr "posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
 
 #: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
@@ -8557,7 +8597,7 @@ msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
 msgid "show only <n> matched refs"
 msgstr "mostra només <n> referències coincidents"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "respecta els colors del format"
 
@@ -8581,63 +8621,63 @@ msgstr "imprimeix només les referències que continguin la comissió"
 msgid "print only refs which don't contain the commit"
 msgstr "imprimeix només les referències que no continguin la comissió"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "fes els objectes d'índex nodes de cap"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "també considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "comprova només la connectivitat"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "habilita la comprovació més estricta"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "mostra el progrés"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
@@ -8682,56 +8722,49 @@ msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automàtica"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr ""
-"S'està empaquetant el dipòsit automàticament en el fons per rendiment "
-"òptim.\n"
+msgstr "S'està empaquetant el dipòsit automàticament en el fons per rendiment òptim.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu \"git help gc\" per neteja manual.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr ""
-"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
+msgid "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr "gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
 
-#: builtin/gc.c:481
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-"
-"los."
+#: builtin/gc.c:487
+msgid "There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-los."
 
 #: builtin/grep.c:27
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: s'ha produït un error en crear fil: %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
@@ -8740,288 +8773,282 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hi ha suport de fils, s'està ignorant %s"
 
-#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:628
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es pot fer grep des d'un objecte de tipus %s"
 
-#: builtin/grep.c:694
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opció «%c» espera un valor numèric"
 
-#: builtin/grep.c:781
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "cerca en l'índex en lloc de l'arbre de treball"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submòdul"
 
-#: builtin/grep.c:792
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "mostra les línies no coincidents"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "coincidència insensible a majúscula i minúscula"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons només als límits de paraula"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:803
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a màxim <profunditat> nivells"
 
-#: builtin/grep.c:809
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX ampliades"
 
-#: builtin/grep.c:812
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:818
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "mostra els números de línia"
 
-#: builtin/grep.c:822
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "sinònim de --files-with-matches"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "mostra només els noms dels fitxers sense coincidència"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL després dels noms de fitxer"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "ressalta les coincidències"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
-"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
-"mateix fitxer"
+"mostra el nom de fitxer només una vegada a dalt de les coincidències del mateix fitxer"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "mostra <n> línies de context abans i després d'una coincidència"
 
-#: builtin/grep.c:847
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> línies de context abans d'una coincidència"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> línies de context després d'una coincidència"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "drecera per -C NUM"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "mostra una línia amb el nom de funció abans de les coincidències"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "mostra la funció circumdant"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "coincideix amb <patró>"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidència amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
-msgstr ""
-"mostra només les coincidències dels fitxers que coincideixin amb tots els "
-"patrons"
+msgstr "mostra només les coincidències dels fitxers que coincideixin amb tots els patrons"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
 
-#: builtin/grep.c:950
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "cap patró donat."
 
-#: builtin/grep.c:982
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:989
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisió: %s"
 
-#: builtin/grep.c:1023 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "no hi ha suport de fils, s'està ignorant --threads"
 
-#: builtin/grep.c:1052
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager només funciona en l'arbre de treball"
 
-#: builtin/grep.c:1075
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "opció no admesa amb --recurse-submodules."
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached o --untracked no es pot usar amb --no-index."
 
-#: builtin/grep.c:1087
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
 
-#: builtin/grep.c:1095
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "s'han donat ambdós --caches i arbres."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."
 msgstr ""
-"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
-"[--] <fitxer>..."
+"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] [--] "
+"<fitxer>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "tipus"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "tipus d'objecte"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "escriu l'objecte a la base de dades d'objectes"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "llegeix l'objecte des de stdin"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "emmagatzema el fitxer tal com és sense filtres"
 
-#: builtin/hash-object.c:101
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/hash-object.c:102
+msgid "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
-"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
-"depurar al Git"
+"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a depurar al Git"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "processa el fitxer com si fos d'aquest camí"
 
@@ -9153,154 +9180,151 @@ msgstr "«%s» és un àlies de «%s»"
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "no s'ha pogut obrir %s"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "hi ha una discordança de tipus d'objecte a %s"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no es pot omplir %d octet"
 msgstr[1] "no es pot omplir %d octets"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "EOF prematur"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "error de lectura d'entrada"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "s'han usat més octets que hi havia disponibles"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "paquet massa gran per a la definició actual d'off_t"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida màxima permesa"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "no s'ha pogut crear «%s»"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "no es pot obrir el fitxer de paquet «%s»"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "hi ha una discordança de signatura de paquet"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la versió de paquet %<PRIu32> no és compatible"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "la inflació ha retornat %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
-msgstr ""
-"desbordament de valor de desplaçament per a l'objecte base de diferències"
+msgstr "desbordament de valor de desplaçament per a l'objecte base de diferències"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "el desplaçament de base de diferències està fora de límits"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipus d'objecte desconegut %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "no es pot fer pread en el fitxer de paquet"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet"
-msgstr[1] ""
-"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
+msgstr[1] "el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "hi ha una inconsistència seriosa d'inflació"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:168
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182 builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no es pot llegir la informació d'objecte existent %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no es pot llegir l'objecte existent %s"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objecte de blob no vàlid %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Error en objecte"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No tots els objectes fills de %s són abastables"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "s'ha produït un error en aplicar la diferència"
 
@@ -9370,77 +9394,81 @@ msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "error en tancar el fitxer de paquet"
-
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1397
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "no es pot escriure el fitxer a mantenir «%s»"
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot close written keep file '%s'"
+msgid "cannot write %s file '%s'"
+msgstr "no es pot escriure «%s» al fitxer «%s»"
+
+#: builtin/index-pack.c:1430
+#, fuzzy, c-format
+msgid "cannot close written %s file '%s'"
 msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "error en tancar el fitxer de paquet"
+
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "no es pot emmagatzemar el fitxer de paquet"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "no es pot emmagatzemar el fitxer d'índex"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorrecte"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No es pot obrir el fitxer de paquet existent «%s»"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "sense diferències: %d objecte"
 msgstr[1] "sense diferències: %d objectes"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longitud de cadena = %d: %lu objecte"
 msgstr[1] "longitud de cadena = %d: %lu objectes"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "No es pot tornar al directori de treball actual"
 
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
-#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 builtin/index-pack.c:1743
+#: builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "%s incorrecte"
 
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no es pot usar sense --stdin"
 
-#: builtin/index-pack.c:1746
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin requereix un dipòsit git"
 
-#: builtin/index-pack.c:1754
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
@@ -9624,451 +9652,455 @@ msgstr "--trailer amb --only-input no té sentit"
 msgid "no input file given for in-place editing"
 msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opcions>] <objecte>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opció --decorate no vàlida: %s"
 
-#: builtin/log.c:148
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "omet la sortida de diferències"
 
-#: builtin/log.c:149
+#: builtin/log.c:154
 msgid "show source"
 msgstr "mostra la font"
 
-#: builtin/log.c:150
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "Usa el fitxer de mapa de correu"
 
-#: builtin/log.c:151
+#: builtin/log.c:157
+msgid "only decorate refs that match <pattern>"
+msgstr "només decora les referències que coincideixin amb <patró>"
+
+#: builtin/log.c:159
+msgid "do not decorate refs that match <pattern>"
+msgstr "no decoris les referències que coincideixen amb <patró>"
+
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "opcions de decoració"
 
-#: builtin/log.c:154
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
 
-#: builtin/log.c:250
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:501
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer incorrecte"
 
-#: builtin/log.c:516 builtin/log.c:610
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "No es pot llegir l'objecte %s"
 
-#: builtin/log.c:634
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipus desconegut: %d"
 
-#: builtin/log.c:755
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:856
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "el nom del directori de sortida és massa llarg"
 
-#: builtin/log.c:872
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "No es pot obrir el fitxer de pedaç %s"
 
-#: builtin/log.c:889
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Cal exactament un rang."
 
-#: builtin/log.c:899
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "No és un rang."
 
-#: builtin/log.c:1005
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "La carta de presentació necessita el format de correu electrònic"
 
-#: builtin/log.c:1085
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1112
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1162
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "Hi ha dos directoris de sortida?"
 
-#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Comissió desconeguda %s"
 
-#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "No s'ha pogut trobar la base exacta de fusió."
 
-#: builtin/log.c:1288
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
 "Or you could specify base commit by --base=<base-commit-id> manually."
 msgstr ""
-"S'ha produït un error en obtenir la font. Si voleu registrar la comissió "
-"base\n"
+"S'ha produït un error en obtenir la font. Si voleu registrar la comissió base\n"
 "automàticament, useu git branch --set-upstream-to per a\n"
 "seguir una branca remota. O podeu especificar la comissió base manualment\n"
 "amb --base=<id-de-comissió-base>."
 
-#: builtin/log.c:1308
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "S'ha produït un error en trobar la base exacta de fusió."
 
-#: builtin/log.c:1319
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
 
-#: builtin/log.c:1323
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "la comissió base no ha de ser en la llista de revisions"
 
-#: builtin/log.c:1372
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1431
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
 
-#: builtin/log.c:1443
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de '.patch'"
 
-#: builtin/log.c:1446
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comença numerant els pedaços a <n> en lloc d'1"
 
-#: builtin/log.c:1448
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sèrie com a l'enèsima llançada"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Usa [<prefix>] en lloc de [PATCH]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1459
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capçalera From"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
 
-#: builtin/log.c:1468
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
-msgstr ""
-"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
+msgstr "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1481
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1473 builtin/log.c:1475
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
-msgstr ""
-"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
+msgstr "estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1481
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
 
-#: builtin/log.c:1482 builtin/log.c:1485
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1483
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "adjunta el pedaç"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1494
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1495
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1498
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "mostra el progrés durant la generació de pedaços"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/log.c:1590
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
-msgstr "-n i -k són mutualment exclusius."
+msgstr "-n i -k són mútuament excloents."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
-msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
+msgstr "--subject-prefix/--rfc i -k són mútuament excloents."
 
-#: builtin/log.c:1600
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1634
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "sortida estàndard o directori, quin dels dos?"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "No s'ha pogut crear el directori «%s»"
 
-#: builtin/log.c:1729
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "S'estan generant els pedaços"
 
-#: builtin/log.c:1805
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "S'ha produït un error en crear els fitxers de sortida"
 
-#: builtin/log.c:1855
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:1909
+#: builtin/log.c:1921
 #, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr ""
-"No s'ha pogut trobar una branca remota seguida. Especifiqueu "
-"<font> manualment.\n"
+msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> manualment.\n"
 
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:468
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcions>] [<fitxer>...]"
 
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:517
 msgid "identify the file status with tags"
 msgstr "identifica l'estat de fitxer amb etiquetes"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:519
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "usa lletres minúscules per als fitxers 'fsmonitor clean'"
+
+#: builtin/ls-files.c:523
 msgid "show cached files in the output (default)"
-msgstr ""
-"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
+msgstr "mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:525
 msgid "show deleted files in the output"
 msgstr "mostra en la sortida els fitxers suprimits"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:527
 msgid "show modified files in the output"
 msgstr "mostra en la sortida els fitxers modificats"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:529
 msgid "show other files in the output"
 msgstr "mostra en la sortida els altres fitxers"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:531
 msgid "show ignored files in the output"
 msgstr "mostra en la sortida els fitxers ignorats"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:534
 msgid "show staged contents' object name in the output"
 msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:536
 msgid "show files on the filesystem that need to be removed"
 msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:538
 msgid "show 'other' directories' names only"
 msgstr "mostra només els noms dels directoris 'other'"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:540
 msgid "show line endings of files"
 msgstr "mostra els terminadors de línia dels fitxers"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:542
 msgid "don't show empty directories"
 msgstr "no mostris els directoris buits"
 
-#: builtin/ls-files.c:541
+#: builtin/ls-files.c:545
 msgid "show unmerged files in the output"
 msgstr "mostra en la sortida els fitxers sense fusionar"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:547
 msgid "show resolve-undo information"
 msgstr "mostra la informació de resolució de desfet"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:549
 msgid "skip files matching pattern"
 msgstr "omet els fitxers coincidents amb el patró"
 
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:552
 msgid "exclude patterns are read from <file>"
 msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:555
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:557
 msgid "add the standard git exclusions"
 msgstr "afegeix les exclusions estàndards de git"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:560
 msgid "make the output relative to the project top directory"
 msgstr "fes que la sortida sigui relativa al directori superior del projecte"
 
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:563
 msgid "recurse through submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:565
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
 
-#: builtin/ls-files.c:562
+#: builtin/ls-files.c:566
 msgid "tree-ish"
 msgstr "arbre"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:567
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
-"pretén que els camins eliminats després de <arbre> encara siguin presents"
+msgstr "pretén que els camins eliminats després de <arbre> encara siguin presents"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:569
 msgid "show debugging data"
 msgstr "mostra les dades de depuració"
 
@@ -10115,7 +10147,7 @@ msgstr "tingues en compte url.<base>.insteadOf"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostra la referència subjacent a més de l'objecte que senyali"
 
@@ -10153,151 +10185,148 @@ msgstr "usa els noms de camí complets"
 
 #: builtin/ls-tree.c:144
 msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr ""
-"llista l'arbre sencer; no només el directori actual (implica --full-name)"
+msgstr "llista l'arbre sencer; no només el directori actual (implica --full-name)"
 
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox buit: «%s»"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "l'opció «m» requereix un valor"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:200 builtin/pull.c:134
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostris les estadístiques de diferència al final de la fusió"
 
-#: builtin/merge.c:203 builtin/pull.c:137
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "mostra les estadístiques de diferència al final de la fusió"
 
-#: builtin/merge.c:204 builtin/pull.c:140
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:206 builtin/pull.c:143
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
-"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
-"de fusió"
+"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió de fusió"
 
-#: builtin/merge.c:209 builtin/pull.c:146
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una única comissió en lloc de fusionar"
 
-#: builtin/merge.c:211 builtin/pull.c:149
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissió si la fusió té èxit (per defecte)"
 
-#: builtin/merge.c:213 builtin/pull.c:152
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanç ràpid no és possible"
 
-#: builtin/merge.c:220 builtin/pull.c:161
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
-#: builtin/revert.c:109
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 builtin/revert.c:109
 msgid "strategy"
 msgstr "estratègia"
 
-#: builtin/merge.c:222 builtin/pull.c:166
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "estratègia de fusió a usar"
 
-#: builtin/merge.c:223 builtin/pull.c:169
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:224 builtin/pull.c:170
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "opció per a l'estratègia de fusió seleccionada"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "avorta la fusió en curs actual"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:234 builtin/pull.c:177
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar històries no relacionades"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "verifica el lligam de missatge de comissió"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "no s'ha pogut executar «stash»."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "l'«stash» ha fallat"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (res a fer «squash»)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
@@ -10312,32 +10341,31 @@ msgstr "«%s» no assenyala una comissió"
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
 
-#: builtin/merge.c:666
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "No s'està gestionant res a part de la fusió de dos caps."
 
-#: builtin/merge.c:680
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opció desconeguda de merge-recursive: -X%s"
 
-#: builtin/merge.c:695
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de «%s»"
 
-#: builtin/merge.c:756
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
+msgstr "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
 
-#: builtin/merge.c:762
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10353,70 +10381,69 @@ msgstr ""
 "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
 "avorta la comissió.\n"
 
-#: builtin/merge.c:798
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:818
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:871
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
-"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
-"resultat.\n"
+"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el resultat.\n"
 
-#: builtin/merge.c:910
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:912
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:914
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "No hi ha cap font per defecte definida per a la branca actual."
 
-#: builtin/merge.c:919
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
 
-#: builtin/merge.c:972
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor incorrecte «%s» en l'entorn «%s»"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no és quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1107
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1172
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort no accepta paràmetres"
 
-#: builtin/merge.c:1176
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue no accepta paràmetres"
 
-#: builtin/merge.c:1192
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10424,7 +10451,7 @@ msgstr ""
 "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1215
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10432,119 +10459,116 @@ msgstr ""
 "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1218
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No podeu combinar --squash amb --no-ff."
 
-#: builtin/merge.c:1235
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-"No hi ha una comissió especificada i merge.defaultToUpstream no està "
-"establert."
+msgstr "No hi ha una comissió especificada i merge.defaultToUpstream no està establert."
 
-#: builtin/merge.c:1252
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
 
-#: builtin/merge.c:1259
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no és una cosa que puguem fusionar"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Es pot fusionar només una comissió a un HEAD buit"
 
-#: builtin/merge.c:1295
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
 
-#: builtin/merge.c:1298
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
 
-#: builtin/merge.c:1301
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La comissió %s no té signatura GPG."
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La comissió %s té una signatura GPG bona de %s\n"
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1375
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "Ja està al dia."
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1426
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
 
-#: builtin/merge.c:1433
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1458
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "Ja està al dia. Estupend!"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "No és possible avançar ràpidament, s'està avortant."
 
-#: builtin/merge.c:1487 builtin/merge.c:1566
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'està rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1491
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'està intentant l'estratègia de fusió %s...\n"
 
-#: builtin/merge.c:1557
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratègia de fusió %s ha fallat.\n"
 
-#: builtin/merge.c:1568
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
 
-#: builtin/merge.c:1580
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
-"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
-"demanat\n"
+"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia demanat\n"
 
 #: builtin/merge-base.c:30
 msgid "git merge-base [-a | --all] <commit> <commit>..."
@@ -10566,34 +10590,33 @@ msgstr "git merge-base --is-ancestor <comissió> <comissió>"
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <referència> [<comissió>]"
 
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
 msgid "output all common ancestors"
 msgstr "emet tots els avantpassats comuns"
 
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
 msgid "find ancestors for a single n-way merge"
 msgstr "troba els avantpassats per a una sola fusió d'n vies"
 
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
 msgid "list revs not reachable from others"
 msgstr "llista les revisions no abastables d'altres"
 
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
 msgid "is the first one ancestor of the other?"
 msgstr "és la primera un avantpassat de l'altre?"
 
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
 msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
+msgstr "troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
 
 #: builtin/merge-file.c:9
 msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> "
+"<file2>"
 msgstr ""
-"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
-"<fitxer-original> <fitxer2>"
+"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> <fitxer-"
+"original> <fitxer2>"
 
 #: builtin/merge-file.c:33
 msgid "send results to standard output"
@@ -10686,8 +10709,7 @@ msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
 #: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels "
-"mateixos per a procedir"
+"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos per a procedir"
 
 #: builtin/mv.c:103
 #, c-format
@@ -10698,72 +10720,72 @@ msgstr "%.*s és en l'índex"
 msgid "force move/rename even if target exists"
 msgstr "força el moviment / canvi de nom encara que el destí existeixi"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "omet els errors de moviment / canvi de nom"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "el destí «%s» no és un directori"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "font incorrecta"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "no es pot moure un directori a dins d'ell mateix"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "no es pot moure un directori sobre un fitxer"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "el directori font està buit"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "no està sota control de versions"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "el destí existeix"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "s'està sobreescrivint «%s»"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "No es pot sobreescriure"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "múltiples fonts per al mateix destí"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "el directori destí no existeix"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origen=%s, destí=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "S'està canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "el canvi del nom de «%s» ha fallat"
@@ -10818,40 +10840,37 @@ msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
 
 #: builtin/notes.c:27
 msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) "
+"<object>] [<object>]"
 msgstr ""
-"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
-"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
+"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m <missatge> | -F "
+"<fitxer> | (-c | -C) <objecte>] [<objecte>]"
 
 #: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr ""
-"git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>"
+msgstr "git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>"
 
 #: builtin/notes.c:29
 msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) "
+"<object>] [<object>]"
 msgstr ""
-"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
-"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
+"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m <missatge> | -F "
+"<fitxer> | (-c | -C) <objecte>] [<objecte>]"
 
 #: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr ""
-"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
+msgstr "git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
 
 #: builtin/notes.c:31
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]"
 
 #: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgid "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
-"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] "
-"<referència-de-notes>"
+"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] <referència-de-"
+"notes>"
 
 #: builtin/notes.c:33
 msgid "git notes merge --commit [-v | -q]"
@@ -10866,8 +10885,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]"
 
 #: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <referència-de-notes>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <referència-de-notes>] prune [-n] [-v]"
 
 #: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10945,9 +10964,7 @@ msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte «%s»"
 
 #: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
-msgstr ""
-"especifiqueu el contingut de la nota fent servir l'opció -m o "
-"l'opció -F"
+msgstr "especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
 
 #: builtin/notes.c:204
 msgid "unable to write note object"
@@ -10958,19 +10975,19 @@ msgstr "no s'ha pogut escriure l'objecte de nota"
 msgid "the note contents have been left in %s"
 msgstr "s'han deixat els continguts de la nota en %s"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no es pot llegir «%s»"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no s'ha pogut obrir o llegir «%s»"
 
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
-#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 builtin/notes.c:376
+#: builtin/notes.c:431 builtin/notes.c:517 builtin/notes.c:522 builtin/notes.c:600
+#: builtin/notes.c:662
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
@@ -11003,9 +11020,9 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
 
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
-#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
-#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 builtin/notes.c:512
+#: builtin/notes.c:588 builtin/notes.c:655 builtin/notes.c:805 builtin/notes.c:952
+#: builtin/notes.c:973
 msgid "too many parameters"
 msgstr "massa paràmetres"
 
@@ -11041,11 +11058,11 @@ msgstr "reemplaça les notes existents"
 #: builtin/notes.c:441
 #, c-format
 msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing "
+"notes"
 msgstr ""
-"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
-"Useu '-f' per a sobreescriure les notes existents."
+"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' "
+"per a sobreescriure les notes existents."
 
 #: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
@@ -11063,8 +11080,7 @@ msgstr "llegeix els objectes des de stdin"
 
 #: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
-msgstr ""
-"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
+msgstr "carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
 
 #: builtin/notes.c:508
 msgid "too few parameters"
@@ -11073,11 +11089,11 @@ msgstr "hi ha massa pocs paràmetres"
 #: builtin/notes.c:529
 #, c-format
 msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing "
+"notes"
 msgstr ""
-"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
-"Useu '-f' per a sobreescriure les notes existents."
+"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' "
+"per a sobreescriure les notes existents."
 
 #: builtin/notes.c:541
 #, c-format
@@ -11103,8 +11119,7 @@ msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
 
 #: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
-msgstr ""
-"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
+msgstr "s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
 
 #: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
@@ -11141,11 +11156,10 @@ msgstr "Opcions de fusió"
 
 #: builtin/notes.c:778
 msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)"
 msgstr ""
-"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
-"union/cat_sort_uniq)"
+"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/union/"
+"cat_sort_uniq)"
 
 #: builtin/notes.c:780
 msgid "Committing unmerged notes"
@@ -11185,19 +11199,17 @@ msgstr "una fusió de notes a %s ja està en curs a %s"
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
-"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
-"actual (%s)"
+"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes actual (%s)"
 
 #: builtin/notes.c:868
 #, c-format
 msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with 'git notes "
+"merge --commit', or abort the merge with 'git notes merge --abort'.\n"
 msgstr ""
-"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
-"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
-"'git notes merge --abort'.\n"
+"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i cometeu el "
+"resultat amb 'git notes merge --commit', o avorteu la fusió amb 'git notes merge --"
+"abort'.\n"
 
 #: builtin/notes.c:890
 #, c-format
@@ -11212,7 +11224,7 @@ msgstr "l'intent d'eliminar una nota no existent no és un error"
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "no eliminis, només mostra"
 
@@ -11233,202 +11245,203 @@ msgstr "usa les notes de <referència-de-notes>"
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
-#: builtin/pack-objects.c:31
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/pack-objects.c:33
+msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
-"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
-"<llista-de-objectes>]"
+"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < <llista-de-"
+"objectes>]"
 
-#: builtin/pack-objects.c:32
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/pack-objects.c:34
+msgid "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
-"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
-"<llista-de-objectes>]"
+"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < <llista-de-"
+"objectes>]"
 
-#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error de deflació (%d)"
 
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
-"a causa de pack.packSizeLimit"
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets a causa de "
+"pack.packSizeLimit"
 
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:1070
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
-"s'empaqueten"
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no s'empaqueten"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "S'estan comprimint objectes"
 
-#: builtin/pack-objects.c:2849
+#: builtin/pack-objects.c:2625
+msgid "invalid value for --missing"
+msgstr "valor no vàlid per a --missing"
+
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versió d'índex no compatible %s"
 
-#: builtin/pack-objects.c:2853
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versió d'índex incorrecta «%s»"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "no mostris l'indicador de progrés"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "mostra l'indicador de progrés"
 
-#: builtin/pack-objects.c:2887
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
 
-#: builtin/pack-objects.c:2890
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "versió[,desplaçament]"
 
-#: builtin/pack-objects.c:2892
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
-msgstr ""
-"escriu el fitxer d'índex de paquet en la versió de format d'índex "
-"especificada"
+msgstr "escriu el fitxer d'índex de paquet en la versió de format d'índex especificada"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "mida màxima de cada fitxer de paquet de sortida"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
-msgstr ""
-"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
-msgstr ""
-"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
+msgstr "limita la finestra d'empaquetament per memòria a més del límit d'objectes"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr ""
-"longitud màxima de la cadena de diferències permesa en el paquet resultant"
+msgstr "longitud màxima de la cadena de diferències permesa en el paquet resultant"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "reusa les diferències existents"
 
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr "usa fils en cercar les millores coincidències de diferències"
 
-#: builtin/pack-objects.c:2915
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "no creïs una emissió de paquet buida"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "limita els objectes als quals encara no s'hagin empaquetat"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referència"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr ""
-"inclou els objectes als quals facin referència les entrades del registre de "
-"referències"
+"inclou els objectes als quals facin referència les entrades del registre de referències"
 
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
-msgstr ""
-"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
+msgstr "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
 
-#: builtin/pack-objects.c:2935
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "retén els objectes inabastables"
 
-#: builtin/pack-objects.c:2937
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:2939
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaqueta els objectes inabastables més nous que <hora>"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "nivell de compressió de paquet"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
-"usa un índex de mapa de bits, si està disponible, per a accelerar el "
-"recompte d'objectes"
+"usa un índex de mapa de bits, si està disponible, per a accelerar el recompte d'objectes"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
 
-#: builtin/pack-objects.c:3081
+#: builtin/pack-objects.c:3036
+msgid "handling for missing objects"
+msgstr "gestió dels objectes absents"
+
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
@@ -11453,18 +11466,22 @@ msgid "Removing duplicate objects"
 msgstr "S'estan eliminant objectes duplicats"
 
 #: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "informa d'objectes podats"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "fes caducar els objectes més vells que <hora>"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "no es pot podar en un dipòsit d'objectes preciosos"
 
@@ -11477,55 +11494,50 @@ msgstr "Valor no vàlid per a %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:127
 msgid "control for recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/pull.c:128
+#: builtin/pull.c:131
 msgid "Options related to merging"
 msgstr "Opcions relacionades amb fusionar"
 
-#: builtin/pull.c:131
+#: builtin/pull.c:134
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "permet l'avanç ràpid"
 
-#: builtin/pull.c:164
+#: builtin/pull.c:170
 msgid "automatically stash/stash pop before and after rebase"
-msgstr ""
-"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
+msgstr "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
 
-#: builtin/pull.c:180
+#: builtin/pull.c:186
 msgid "Options related to fetching"
 msgstr "Opcions relacionades amb obtenir"
 
-#: builtin/pull.c:198
+#: builtin/pull.c:204
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de submòduls baixats en paral·lel"
 
-#: builtin/pull.c:287
+#: builtin/pull.c:299
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor no vàlid per a pull.ff: %s"
 
-#: builtin/pull.c:403
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/pull.c:415
+msgid "There is no candidate for rebasing against among the refs that you just fetched."
 msgstr ""
-"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
-"acabeu d'obtenir."
+"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que acabeu "
+"d'obtenir."
 
-#: builtin/pull.c:405
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
-msgstr ""
-"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
+#: builtin/pull.c:417
+msgid "There are no candidates for merging among the refs that you just fetched."
+msgstr "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
 
-#: builtin/pull.c:406
+#: builtin/pull.c:418
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11533,7 +11545,7 @@ msgstr ""
 "Generalment això vol dir que heu proveït una especificació de\n"
 "referència de comodí que no tenia cap coincidència en el costat remot."
 
-#: builtin/pull.c:409
+#: builtin/pull.c:421
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11544,44 +11556,40 @@ msgstr ""
 "Perquè aquest no és el remot configurat per defecte per a la vostra\n"
 "branca actual, heu d'especificar una branca en la línia d'ordres."
 
-#: builtin/pull.c:414 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
 
-#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Especifiqueu amb quina branca voleu fusionar."
 
-#: builtin/pull.c:419 builtin/pull.c:434
+#: builtin/pull.c:431 builtin/pull.c:446
 msgid "See git-pull(1) for details."
 msgstr "Vegeu git-pull(1) per detalls."
 
-#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
-#: git-parse-remote.sh:64
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:429 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "No hi ha cap informació de seguiment per a la branca actual."
 
-#: builtin/pull.c:438 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
-msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:"
+#: builtin/pull.c:450 git-parse-remote.sh:95
+msgid "If you wish to set tracking information for this branch you can do so with:"
+msgstr "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:"
 
-#: builtin/pull.c:443
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11590,28 +11598,27 @@ msgstr ""
 "La vostra configuració especifica fusionar amb la referència «%s»\n"
 "del remot, però no s'ha obtingut tal referència."
 
-#: builtin/pull.c:796
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'està ignorant --verify-signatures en fer «rebase»"
 
-#: builtin/pull.c:844
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
 
-#: builtin/pull.c:852
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
-msgstr ""
-"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
+msgstr "S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
 
-#: builtin/pull.c:855
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:856
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:881
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11622,7 +11629,7 @@ msgstr ""
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:886
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11633,22 +11640,21 @@ msgid ""
 "to recover."
 msgstr ""
 "No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
-"de\n"
+"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n"
 "$ git diff %s\n"
 "executeu\n"
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar múltiples branques a un HEAD buit."
 
-#: builtin/pull.c:905
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/pull.c:912
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "no es pot fer «rebase» amb modificacions als submòduls enregistrades localment"
 
@@ -11656,24 +11662,23 @@ msgstr "no es pot fer «rebase» amb modificacions als submòduls enregistrades
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/push.c:90
+#: builtin/push.c:92
 msgid "tag shorthand without <tag>"
 msgstr "abreviatura d'etiqueta sense <tag>"
 
-#: builtin/push.c:100
+#: builtin/push.c:102
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete només accepta noms de referència de destí senzills"
 
-#: builtin/push.c:144
+#: builtin/push.c:146
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 "\n"
-"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help "
-"config'."
+"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help config'."
 
-#: builtin/push.c:147
+#: builtin/push.c:149
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11698,7 +11703,7 @@ msgstr ""
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:162
+#: builtin/push.c:164
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11713,7 +11718,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-branca-remota>\n"
 
-#: builtin/push.c:176
+#: builtin/push.c:178
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11726,13 +11731,12 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:184
+#: builtin/push.c:186
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr ""
-"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
+msgstr "La branca actual %s té múltiples branques fonts, s'està refusant pujar."
 
-#: builtin/push.c:187
+#: builtin/push.c:189
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -11743,14 +11747,13 @@ msgstr ""
 "branca actual «%s», sense dir-me què pujar per a actualitzar\n"
 "quina branca remota."
 
-#: builtin/push.c:246
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/push.c:248
+msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
-"No heu especificat cap especificació de referència a pujar, i push.default "
-"és \"nothing\"."
+"No heu especificat cap especificació de referència a pujar, i push.default és \"nothing"
+"\"."
 
-#: builtin/push.c:253
+#: builtin/push.c:255
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11762,7 +11765,7 @@ msgstr ""
 "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
 "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
 
-#: builtin/push.c:259
+#: builtin/push.c:261
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -11775,7 +11778,7 @@ msgstr ""
 "abans de pujar de nou.\n"
 "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
 
-#: builtin/push.c:265
+#: builtin/push.c:267
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -11790,12 +11793,11 @@ msgstr ""
 "pujar de nou.\n"
 "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
 
-#: builtin/push.c:272
+#: builtin/push.c:274
 msgid "Updates were rejected because the tag already exists in the remote."
-msgstr ""
-"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
+msgstr "S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
 
-#: builtin/push.c:275
+#: builtin/push.c:277
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -11806,26 +11808,25 @@ msgstr ""
 "fer que assenyali un objecte no de comissió, sense usar l'opció\n"
 "'--force'.\n"
 
-#: builtin/push.c:335
+#: builtin/push.c:337
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "S'està pujant a %s\n"
 
-#: builtin/push.c:339
+#: builtin/push.c:341
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "s'ha produït un error en pujar algunes referències a «%s»"
 
-#: builtin/push.c:370
+#: builtin/push.c:372
 #, c-format
 msgid "bad repository '%s'"
 msgstr "dipòsit incorrecte «%s»"
 
-#: builtin/push.c:371
+#: builtin/push.c:373
 msgid ""
 "No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
 "\n"
 "    git remote add <name> <url>\n"
 "\n"
@@ -11834,8 +11835,8 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 "No hi ha cap destí de pujada configurat.\n"
-"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot "
-"fent servir\n"
+"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot fent "
+"servir\n"
 "\n"
 "    git remote add <nom> <url>\n"
 "\n"
@@ -11843,124 +11844,123 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:389
+#: builtin/push.c:391
 msgid "--all and --tags are incompatible"
 msgstr "--all i --tags són incompatibles"
 
-#: builtin/push.c:390
+#: builtin/push.c:392
 msgid "--all can't be combined with refspecs"
 msgstr "--all no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:395
+#: builtin/push.c:397
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror i --tags són incompatibles"
 
-#: builtin/push.c:396
+#: builtin/push.c:398
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:401
+#: builtin/push.c:403
 msgid "--all and --mirror are incompatible"
 msgstr "--all i --mirror són incompatibles"
 
-#: builtin/push.c:523
+#: builtin/push.c:535
 msgid "repository"
 msgstr "dipòsit"
 
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
 msgid "push all refs"
 msgstr "puja totes les referències"
 
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
 msgid "mirror all refs"
 msgstr "reflecteix totes les referències"
 
-#: builtin/push.c:527
+#: builtin/push.c:539
 msgid "delete refs"
 msgstr "suprimeix les referències"
 
-#: builtin/push.c:528
+#: builtin/push.c:540
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
 
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
 msgid "force updates"
 msgstr "força les actualitzacions"
 
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
 msgid "refname>:<expect"
 msgstr "nom-de-referència>:<esperat"
 
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
 msgid "require old value of ref to be at this value"
 msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
 
-#: builtin/push.c:537
+#: builtin/push.c:549
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submòduls"
 
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "usa el paquet prim"
 
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 builtin/send-pack.c:161
 msgid "receive pack program"
 msgstr "programa que rep els paquets"
 
-#: builtin/push.c:542
+#: builtin/push.c:554
 msgid "set upstream for git pull/status"
 msgstr "estableix la font per a git pull/status"
 
-#: builtin/push.c:545
+#: builtin/push.c:557
 msgid "prune locally removed refs"
 msgstr "poda les referències eliminades localment"
 
-#: builtin/push.c:547
+#: builtin/push.c:559
 msgid "bypass pre-push hook"
 msgstr "evita el lligam de prepujada"
 
-#: builtin/push.c:548
+#: builtin/push.c:560
 msgid "push missing but relevant tags"
 msgstr "puja les etiquetes absents però rellevants"
 
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "signa la pujada amb GPG"
 
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "demana una transacció atòmica al costat remot"
 
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "específic al servidor"
 
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "opció a transmetre"
 
-#: builtin/push.c:568
+#: builtin/push.c:583
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete és incompatible amb --all, --mirror i --tags"
 
-#: builtin/push.c:570
+#: builtin/push.c:585
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no té sentit sense referències"
 
-#: builtin/push.c:589
+#: builtin/push.c:604
 msgid "push options must not have new line characters"
 msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
 
 #: builtin/read-tree.c:40
 msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--"
+"exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] "
+"(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--"
+"exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-"
+"output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
 
 #: builtin/read-tree.c:121
 msgid "write resulting index to <file>"
@@ -12030,47 +12030,55 @@ msgstr "depura unpack-trees"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<opcions>]"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:24
 msgid "keep empty commits"
 msgstr "mantén les comissions buides"
 
-#: builtin/rebase--helper.c:23
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "permet les comissions amb missatges buits"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "continua el «rebase»"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "avorta el «rebase»"
 
-#: builtin/rebase--helper.c:28
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "fes un script de «rebase»"
 
-#: builtin/rebase--helper.c:30
-msgid "shorten SHA-1s in the todo list"
-msgstr "escurça els SHA-1 en la llista per a fer"
+#: builtin/rebase--helper.c:34
+msgid "shorten commit ids in the todo list"
+msgstr "escurça els ids de les comissions en la llista per a fer"
 
-#: builtin/rebase--helper.c:32
-msgid "expand SHA-1s in the todo list"
-msgstr "expandeix els SHA-1 en la llista per a fer"
+#: builtin/rebase--helper.c:36
+msgid "expand commit ids in the todo list"
+msgstr "expandeix els ids de els comissions en la llista per a fer"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "comprova la llista a fer"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "omet els «picks» no necessaris"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "reorganitza les línies «fixup/pick»"
 
-#: builtin/receive-pack.c:29
+#: builtin/rebase--helper.c:44
+msgid "insert exec commands in todo list"
+msgstr "expandeix les ordres exec en la llista per a fer"
+
+#: builtin/receive-pack.c:30
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:839
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12101,7 +12109,7 @@ msgstr ""
 "predeterminat, establiu la variable de configuració\n"
 "'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:859
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12123,20 +12131,15 @@ msgstr ""
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
 
-#: builtin/receive-pack.c:1932
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:1946
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Heu d'especificar un directori."
 
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "«%s» per a «%s» no és una marca de temps vàlida"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "«%s» no és una marca de temps vàlida"
@@ -12147,11 +12150,11 @@ msgstr "git remote [-v | --verbose]"
 
 #: builtin/remote.c:14
 msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|"
+"push>] <name> <url>"
 msgstr ""
-"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nom> <url>"
+"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--mirror=<fetch|"
+"push>] <nom> <url>"
 
 #: builtin/remote.c:15 builtin/remote.c:35
 msgid "git remote rename <old> <new>"
@@ -12174,10 +12177,8 @@ msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
 #: builtin/remote.c:20
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr ""
-"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
+msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
 
 #: builtin/remote.c:21
 msgid "git remote set-branches [--add] <name> <branch>..."
@@ -12276,8 +12277,7 @@ msgstr "especificar una branca mestra no té sentit amb --mirror"
 
 #: builtin/remote.c:184
 msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr ""
-"especificar les branques a seguir té sentit només amb miralls d'obtenció"
+msgstr "especificar les branques a seguir té sentit només amb miralls d'obtenció"
 
 #: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
@@ -12297,8 +12297,7 @@ msgstr "No s'ha pogut configurar la mestra «%s»"
 #: builtin/remote.c:337
 #, c-format
 msgid "Could not get fetch map for refspec %s"
-msgstr ""
-"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
+msgstr "No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
 
 #: builtin/remote.c:438 builtin/remote.c:446
 msgid "(matching)"
@@ -12325,8 +12324,7 @@ msgid ""
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per "
-"defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n"
 "\t%s\n"
 "\tActualitzeu la configuració manualment si és necessari."
 
@@ -12351,8 +12349,7 @@ msgstr[0] ""
 "Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
 "per a suprimir-la, useu:"
 msgstr[1] ""
-"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
-"eliminat;\n"
+"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n"
 "per a suprimir-les, useu:"
 
 #: builtin/remote.c:810
@@ -12489,10 +12486,8 @@ msgstr "(desconegut)"
 
 #: builtin/remote.c:1171
 #, c-format
-msgid ""
-"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr ""
-"  Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
+msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr "  Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
 
 #: builtin/remote.c:1183
 #, c-format
@@ -12536,9 +12531,7 @@ msgstr "No es pot determinar el HEAD remot"
 
 #: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr ""
-"Múltiples branques de HEAD remotes. Trieu-ne una explícitament "
-"amb:"
+msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:"
 
 #: builtin/remote.c:1259
 #, c-format
@@ -12666,89 +12659,88 @@ msgstr ""
 "Els reempaquetaments incrementals són incompatibles amb els índexs de bitmaps.  Useu\n"
 "--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "empaqueta-ho tot en un únic paquet"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "el mateix que -a, i solta els objectes inabastables"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "elimina els paquets redundants, i executeu git-prune-packed"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passa --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passa --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "escriu índex de mapa de bits"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "data aproximada"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "amb -A, no soltis els objectes més vells que aquest"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "mida de la finestra que s'usa per a compressió de diferències"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
-"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
-"d'entrades"
+"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre d'entrades"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "limita el nombre màxim de fils"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "mida màxima de cada fitxer de paquet"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable i -A són incompatibles"
 
-#: builtin/repack.c:406 builtin/worktree.c:134
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "s'ha produït un error en eliminar «%s»"
@@ -12791,11 +12783,11 @@ msgstr "etiqueta de fusió mal formada en la comissió «%s»"
 #: builtin/replace.c:374
 #, c-format
 msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit instead of --"
+"graft"
 msgstr ""
-"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
-"useu --edit en lloc de --graft"
+"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; useu --edit en "
+"lloc de --graft"
 
 #: builtin/replace.c:407
 #, c-format
@@ -12831,11 +12823,11 @@ msgstr "canvia les mares d'una comissió"
 msgid "replace the ref if it exists"
 msgstr "reemplaça la referència si existeix"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimeixis bellament els continguts per a --edit"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "usa aquest format"
 
@@ -12848,10 +12840,8 @@ msgid "register clean resolutions in index"
 msgstr "registra les resolucions netes en l'índex"
 
 #: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
+msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
 
 #: builtin/reset.c:30
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
@@ -12894,91 +12884,106 @@ msgstr "S'ha produït un error en trobar l'arbre de HEAD."
 msgid "Failed to find tree of %s."
 msgstr "S'ha produït un error en cercar l'arbre de %s."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ara és a %s"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "sigues silenciós, només informa d'errors"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'índex i l'arbre de treball"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr "registra només el fet que els camins eliminats s'afegiran després"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch és incompatible amb --{hard,mixed,soft}"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr ""
-"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc "
-"d'això."
+msgstr "--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc d'això."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "el restabliment de %s no es permet en un dipòsit nu"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N només es pot usar amb --mixed"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 
-#: builtin/rev-list.c:361
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:455
+msgid "object filtering requires --objects"
+msgstr "el filtratge d'objectes requereix --objects"
+
+#: builtin/rev-list.c:458
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "valor parcial no vàlid: «%s»"
+
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
+#: builtin/rev-list.c:502
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes"
+
 #: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
@@ -13007,8 +13012,7 @@ msgstr ""
 "   or: git rev-parse --sq-quote [<paràmetre>...]\n"
 "   or: git rev-parse [<opcions>] [<paràmetre>...]\n"
 "\n"
-"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús "
-"inicial."
+"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús inicial."
 
 #: builtin/revert.c:23
 msgid "git revert [<options>] <commit-ish>..."
@@ -13079,10 +13083,6 @@ msgstr "nom de la comissió a annexar"
 msgid "preserve initially empty commits"
 msgstr "preserva les comissions inicialment buides"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "retén les comissions redundants i buides"
@@ -13178,15 +13178,13 @@ msgstr "no s'ha pogut suprimir «%s»"
 
 #: builtin/send-pack.c:19
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-"
+"pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
-"pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] "
-"[<màquina>:]<directori> [<referència>...]\n"
-"  --all i especificació <referència> explícita són mutualment exclusius."
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<paquet-del-git-"
+"receive>] [--verbose] [--thin] [--atomic] [<màquina>:]<directori> [<referència>...]\n"
+"  --all i especificació <referència> explícita són mútuament excloents."
 
 #: builtin/send-pack.c:162
 msgid "remote name"
@@ -13218,8 +13216,7 @@ msgstr "ordena la sortida segons el nombre de comissions per autor"
 
 #: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
-msgstr ""
-"Omet les descripcions de comissió, només proveeix el recompte de comissions"
+msgstr "Omet les descripcions de comissió, només proveeix el recompte de comissions"
 
 #: builtin/shortlog.c:269
 msgid "Show the email address of each author"
@@ -13326,10 +13323,8 @@ msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostra les <n> entrades més recents començant a la base"
 
 #: builtin/show-branch.c:690
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
+msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr "--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
 
 #: builtin/show-branch.c:714
 msgid "no branches given, and HEAD is not valid"
@@ -13370,11 +13365,11 @@ msgstr "no es pot trobar la comissió %s (%s)"
 
 #: builtin/show-ref.c:10
 msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] "
+"[--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
 msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] "
+"[--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
 
 #: builtin/show-ref.c:11
 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -13390,9 +13385,7 @@ msgstr "mostra només els caps (es pot combinar amb tags)"
 
 #: builtin/show-ref.c:161
 msgid "stricter reference checking, requires exact ref path"
-msgstr ""
-"comprovació de referència més estricta, requereix el camí de referència "
-"exacte"
+msgstr "comprovació de referència més estricta, requereix el camí de referència exacte"
 
 #: builtin/show-ref.c:164 builtin/show-ref.c:166
 msgid "show the HEAD reference, even if it would be filtered out"
@@ -13424,231 +13417,343 @@ msgstr "git stripspace [-c | --comment-lines]"
 
 #: builtin/stripspace.c:36
 msgid "skip and remove all lines starting with comment character"
-msgstr ""
-"omet i elimina totes les línies que comencin amb el caràcter de comentari"
+msgstr "omet i elimina totes les línies que comencin amb el caràcter de comentari"
 
 #: builtin/stripspace.c:39
 msgid "prepend comment character and space to each line"
 msgstr "anteposa el caràcter de comentari i un espai a cada línia"
 
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referència: %s"
 
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "S'espera un nom de referència ple, s'ha rebut %s"
 
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no es pot despullar un component de l'url «%s»"
 
-#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "àncora alternativa per als camins relatius"
 
-#: builtin/submodule--helper.c:307
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
 
-#: builtin/submodule--helper.c:389
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+"could not lookup configuration '%s'. Assuming this repository is its own authoritative "
+"upstream."
 msgstr ""
-"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és el seu dipòsit font autoritzat."
+"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és el seu "
+"dipòsit font autoritzat."
 
-#: builtin/submodule--helper.c:400
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:404
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
 
-#: builtin/submodule--helper.c:414
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr ""
-"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
-"«%s»\n"
+msgstr "advertència: se suggereix el mode d'actualització per ordre per al submòdul «%s»\n"
 
-#: builtin/submodule--helper.c:421
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
-"S'ha produït un error en registrar el mode d'actualització per al camí de "
-"submòdul «%s»"
+"S'ha produït un error en registrar el mode d'actualització per al camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:437
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "Omet la sortida d'inicialitzar un submòdul"
 
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<camí>]"
 
-#: builtin/submodule--helper.c:470
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
+
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
+
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
+msgid "Suppress submodule status output"
+msgstr "Suprimeix la sortida de l'estat del submòdul"
+
+#: builtin/submodule--helper.c:712
+msgid "Use commit stored in the index instead of the one stored in the submodule HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:713
+msgid "recurse into nested submodules"
+msgstr "inclou recursivament els submòduls imbrincats"
+
+#: builtin/submodule--helper.c:718
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr  "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
+
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camí>"
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:806
 #, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
+
+#: builtin/submodule--helper.c:826
+#,  c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Omet la sortida de la sincronització de l'url del submòdul"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Inclou recursivament els submòduls imbrincats"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you really want to "
+"remove it including all of its history)"
+msgstr ""
+"L'arbre de treball de submòdul «%s» conté un directori .git\n"
+"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid "Submodule work tree '%s' contains local modifications; use '-f' to discard them"
+msgstr ""
+"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' per "
+"a descartar-les"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "S'ha netejat el directori «%s»\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
 
-#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "no s'ha pogut crear el directori de submòdul buit %s"
+
+#: builtin/submodule--helper.c:993
+#, fuzzy, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis locals"
+
+#: builtin/submodule--helper.c:1023
+#, fuzzy
+msgid "Unregister all submodules"
+msgstr "inclou recursivament als submòduls"
+
+#: builtin/submodule--helper.c:1028
+msgid "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr  "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarà el submòdul nou"
 
-#: builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "nom del submòdul nou"
 
-#: builtin/submodule--helper.c:632
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "url del qual clonar el submòdul"
 
-#: builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "força el progrés del clonatge"
 
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:1221
 msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference <repository>] [--"
+"name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
-"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
-"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
+"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference <dipòsit>] [--name "
+"<nom>] [--depth <profunditat>] --url <url> --path <camí>"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
 
-#: builtin/submodule--helper.c:692
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
 
-#: builtin/submodule--helper.c:757
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "El camí de submòdul «%s» no està inicialitzat"
 
-#: builtin/submodule--helper.c:761
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potser voleu usar 'update --init'?"
 
-#: builtin/submodule--helper.c:790
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "S'està ometent el submòdul no fusionat %s"
 
-#: builtin/submodule--helper.c:819
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "S'està ometent el submòdul «%s»"
 
-#: builtin/submodule--helper.c:952
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
 
-#: builtin/submodule--helper.c:963
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
 
-#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "camí a l'arbre de treball"
 
-#: builtin/submodule--helper.c:996
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
 
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1004
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
 
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "tasques paral·leles"
 
-#: builtin/submodule--helper.c:1009
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
 
-#: builtin/submodule--helper.c:1010
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrés del clonatge"
 
-#: builtin/submodule--helper.c:1017
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:1030
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "valor incorrecte per al paràmetre update"
 
-#: builtin/submodule--helper.c:1098
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+"Submodule (%s) branch configured to inherit branch from superproject, but the "
+"superproject is not on any branch"
 msgstr ""
-"La branca de submòdul (%s) està configurada per a heretar la branca del "
-"superprojecte, però el superprojecte no és en cap branca"
+"La branca de submòdul (%s) està configurada per a heretar la branca del superprojecte, "
+"però el superprojecte no és en cap branca"
 
-#: builtin/submodule--helper.c:1214
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/submodule--helper.c:1220
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<camí>...]"
 
-#: builtin/submodule--helper.c:1278
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:1284
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» no és una subordre vàlida de submodule--helper"
@@ -13682,12 +13787,10 @@ msgid "reason of the update"
 msgstr "raó de l'actualització"
 
 #: builtin/tag.c:24
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+msgid "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
-"d'etiqueta> [<cap>]"
+"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-d'etiqueta> "
+"[<cap>]"
 
 #: builtin/tag.c:25
 msgid "git tag -d <tagname>..."
@@ -13695,12 +13798,12 @@ msgstr "git tag -d <nom-d'etiqueta>..."
 
 #: builtin/tag.c:26
 msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at "
+"<object>]\n"
 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
 msgstr ""
-"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
-"[--points-at <objecte>]\n"
+"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] [--points-"
+"at <objecte>]\n"
 "\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
 
 #: builtin/tag.c:28
@@ -13736,14 +13839,13 @@ msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
 msgstr ""
 "\n"
 "Escriviu el missatge de l'etiqueta:\n"
 "  %s\n"
-"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
-"mateix si voleu.\n"
+"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós mateix si "
+"voleu.\n"
 
 #: builtin/tag.c:189
 msgid "unable to sign the tag"
@@ -13753,381 +13855,412 @@ msgstr "no s'ha pogut signar l'etiqueta"
 msgid "unable to write tag file"
 msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "el tipus d'objecte és incorrecte."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "llista els noms d'etiqueta"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "suprimeix les etiquetes"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "verifica les etiquetes"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Opcions de creació d'etiquetes"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "etiqueta anotada, necessita un missatge"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "missatge d'etiqueta"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "força l'edició del missatge de l'etiqueta"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "etiqueta anotada i signada per GPG"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "usa una altra clau per a signar l'etiqueta"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "crea un registre de referències"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "mostra la llista d'etiquetes en columnes"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "imprimeix només les etiquetes que continguin la comissió"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "imprimeix només les etiquetes que no continguin la comissió"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "imprimeix només les etiquetes que s'han fusionat"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "imprimeix només les etiquetes que no s'han fusionat"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column i -n són incompatibles"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "es permet l'opció -n només amb mode llista"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "es permet l'opció --contains només amb mode llista"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "es permet l'opció --no-contains només amb mode llista"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "es permet --points-at option només amb mode llista"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "només es permet una opció -F o -m."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "massa paràmetres"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» no és un nom d'etiqueta vàlid."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'etiqueta «%s» ja existeix"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta «%s» actualitzada (era %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "S'estan desempaquetant els objectes"
 
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
 #, c-format
 msgid "failed to create directory %s"
 msgstr "s'ha produït un error en crear el directori %s"
 
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
 #, c-format
 msgid "failed to stat %s"
 msgstr "s'ha produït un error en fer stat a %s"
 
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
 #, c-format
 msgid "failed to create file %s"
 msgstr "s'ha produït un error en crear el fitxer %s"
 
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "s'ha produït un error en suprimir el fitxer %s"
 
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "s'ha produït un error en suprimir el directori %s"
 
-#: builtin/update-index.c:136
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "S'està provant mtime en «%s» "
 
-#: builtin/update-index.c:150
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
-msgstr ""
-"la informació d'stat de directori no canvia després d'afegir un fitxer nou"
+msgstr "la informació d'stat de directori no canvia després d'afegir un fitxer nou"
 
-#: builtin/update-index.c:163
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
-msgstr ""
-"la informació d'stat de directori no canvia després d'afegir un directori nou"
+msgstr "la informació d'stat de directori no canvia després d'afegir un directori nou"
 
-#: builtin/update-index.c:176
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
-msgstr ""
-"la informació d'stat de directori canvia després d'actualitzar un fitxer"
+msgstr "la informació d'stat de directori canvia després d'actualitzar un fitxer"
 
-#: builtin/update-index.c:187
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
-"la informació d'stat de directori canvia després d'afegir un fitxer dins "
-"d'un subdirectori"
+"la informació d'stat de directori canvia després d'afegir un fitxer dins d'un "
+"subdirectori"
 
-#: builtin/update-index.c:198
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
-msgstr ""
-"la informació d'stat de directori no canvia després de suprimir un fitxer"
+msgstr "la informació d'stat de directori no canvia després de suprimir un fitxer"
 
-#: builtin/update-index.c:211
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
-msgstr ""
-"la informació d'stat de directori no canvia després de suprimir un directori"
+msgstr "la informació d'stat de directori no canvia després de suprimir un directori"
 
-#: builtin/update-index.c:218
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:571
+#: builtin/update-index.c:579
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:936
 msgid "continue refresh even when index needs update"
-msgstr ""
-"continua l'actualització encara que l'índex necessiti una actualització"
+msgstr "continua l'actualització encara que l'índex necessiti una actualització"
 
-#: builtin/update-index.c:929
+#: builtin/update-index.c:939
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submòduls"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:942
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:944
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:946
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:938
+#: builtin/update-index.c:948
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'índex contingui entrades no fusionades"
 
-#: builtin/update-index.c:941
+#: builtin/update-index.c:951
 msgid "refresh stat information"
 msgstr "actualitza la informació d'estadístiques"
 
-#: builtin/update-index.c:945
+#: builtin/update-index.c:955
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
 
-#: builtin/update-index.c:949
+#: builtin/update-index.c:959
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camí>"
 
-#: builtin/update-index.c:950
+#: builtin/update-index.c:960
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'índex"
 
-#: builtin/update-index.c:959
+#: builtin/update-index.c:969
 msgid "mark files as \"not changing\""
 msgstr "marca els fitxers com a \"no canviant\""
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:972
 msgid "clear assumed-unchanged bit"
 msgstr "neteja el bit assumed-unchanged"
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:975
 msgid "mark files as \"index-only\""
 msgstr "marca els fitxers com a \"només índex\""
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:978
 msgid "clear skip-worktree bit"
 msgstr "neteja el bit skip-worktree"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
 msgid "add to index only; do not add content to object database"
-msgstr ""
-"només afegeix a l'índex; no afegeixis el contingut a la base de dades "
-"d'objectes"
+msgstr "només afegeix a l'índex; no afegeixis el contingut a la base de dades d'objectes"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
 msgid "remove named paths even if present in worktree"
-msgstr ""
-"elimina els camins anomenats encara que estiguin presents en l'arbre de "
-"treball"
+msgstr "elimina els camins anomenats encara que estiguin presents en l'arbre de treball"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:985
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:987
 msgid "read list of paths to be updated from standard input"
 msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:991
 msgid "add entries from standard input to the index"
 msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
 
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
 
-#: builtin/update-index.c:989
+#: builtin/update-index.c:999
 msgid "only update entries that differ from HEAD"
 msgstr "només actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1003
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1006
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estàndard"
 
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1008
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1012
 msgid "write index in this format"
 msgstr "escriu l'índex en aquest format"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1014
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'índex dividit"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1016
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memòria cau no seguida"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1018
 msgid "test if the filesystem supports untracked cache"
 msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1020
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1022
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1024
+msgid "enable or disable file system monitor"
+msgstr "habilita o inhabilita el monitor del sistema de fitxers"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "marca els fitxers com a vàlids pel fsmonitor"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "neteja el bit de validesa del fsmonitor"
+
+#: builtin/update-index.c:1127
 msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+"core.splitIndex is set to false; remove or change it, if you really want to enable split "
+"index"
 msgstr ""
-"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
-"voleu habilitar l'índex dividit"
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment voleu "
+"habilitar l'índex dividit"
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1136
 msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+"core.splitIndex is set to true; remove or change it, if you really want to disable split "
+"index"
 msgstr ""
-"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
-"voleu inhabilitar l'índex dividit"
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment voleu "
+"inhabilitar l'índex dividit"
 
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1147
 msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
+"core.untrackedCache is set to true; remove or change it, if you really want to disable "
+"the untracked cache"
 msgstr ""
-"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
-"realment voleu inhabilitar el cau no seguit"
+"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si realment voleu "
+"inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1151
 msgid "Untracked cache disabled"
 msgstr "La memòria cau no seguida està inhabilitada"
 
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1159
 msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+"core.untrackedCache is set to false; remove or change it, if you really want to enable "
+"the untracked cache"
 msgstr ""
-"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
-"realment voleu habilitar el cau no seguit"
+"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si realment voleu "
+"habilitar el cau no seguit"
 
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1163
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "La memòria cau no seguida està habilitada per a «%s»"
 
+#: builtin/update-index.c:1171
+#, fuzzy
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment voleu "
+"habilitar l'índex dividit"
+
+#: builtin/update-index.c:1175
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1178
+#, fuzzy
+msgid "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment voleu "
+"inhabilitar l'índex dividit"
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr ""
+
 #: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]"
 
 #: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
-msgstr ""
-"git update-ref [<opcions>]    <nom-de-referència> <valor-nou> [<valor-antic>]"
+msgstr "git update-ref [<opcions>]    <nom-de-referència> <valor-nou> [<valor-antic>]"
 
 #: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
@@ -14189,137 +14322,237 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
 msgid "print tag contents"
 msgstr "imprimeix els continguts de l'etiqueta"
 
-#: builtin/worktree.c:16
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<opcions>] <camí> [<branca>]"
-
 #: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opcions>] <camí> [<commit-ish>"
+
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opcions>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opcions>] <camí>"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <worktree> <camí-nou>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opcions>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:22
+#, fuzzy
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree lock [<opcions>] <camí>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
-#: builtin/worktree.c:46
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
 
-#: builtin/worktree.c:52
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
 
-#: builtin/worktree.c:57 builtin/worktree.c:66
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
 
-#: builtin/worktree.c:76
+#: builtin/worktree.c:90
 #, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
+msgid "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr ""
-"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven %<PRIuMAX> bytes, llegits "
-"%<PRIuMAX>)"
+"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven %<PRIuMAX> bytes, "
+"llegits %<PRIuMAX>)"
 
-#: builtin/worktree.c:84
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
 
-#: builtin/worktree.c:100
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
-"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
-"existent"
+"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no existent"
 
-#: builtin/worktree.c:147
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "fes caducar els arbres de treball més vells que <hora>"
 
-#: builtin/worktree.c:223
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» ja existeix"
 
-#: builtin/worktree.c:254
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de «%s»"
 
-#: builtin/worktree.c:293
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "S'està preparant %s (identificador %s)"
 
-#: builtin/worktree.c:345
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
 
-#: builtin/worktree.c:347
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:349
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:351
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:352
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:360
+#: builtin/worktree.c:395
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "configura el mode de seguiment (vegeu git-branch(1))"
+
+#: builtin/worktree.c:398
+#, fuzzy
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
+
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B i --detach són mutualment exclusius"
+msgstr "-b, -B i --detach són mútuament excloents"
+
+#: builtin/worktree.c:471
+#, fuzzy
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--local només es pot usar dins d'un dipòsit git"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "raó per bloquejar"
 
-#: builtin/worktree.c:511 builtin/worktree.c:544
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» no és un arbre de treball"
 
-#: builtin/worktree.c:513 builtin/worktree.c:546
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
 
-#: builtin/worktree.c:518
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» ja està bloquejat, raó: «%s»"
 
-#: builtin/worktree.c:520
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» ja està bloquejat"
 
-#: builtin/worktree.c:548
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» no està bloquejat"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "«%s» és un arbre de treball principal"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "el destí «%s» ja existeix"
+
+#: builtin/worktree.c:690
+#, fuzzy, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "No es poden eliminar els canvis de l'arbre de treball"
+
+#: builtin/worktree.c:692
+#, fuzzy
+msgid "cannot move a locked working tree"
+msgstr "No es pot registrar l'estat de l'arbre de treball"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "s'ha produït un error en moure «%s» a «%s»"
+
+#: builtin/worktree.c:748
+#, fuzzy, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:757
+#, fuzzy, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, fuzzy, c-format
+msgid "failed to delete '%s'"
+msgstr "s'ha produït un error en executar «%s»"
+
+#: builtin/worktree.c:794
+#, fuzzy
+msgid "force removing even if the worktree is dirty"
+msgstr "força el moviment / canvi de nom encara que el destí existeixi"
+
+#: builtin/worktree.c:815
+#, fuzzy, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "No es poden eliminar els canvis de l'arbre de treball"
+
+#: builtin/worktree.c:817
+#, fuzzy
+msgid "cannot remove a locked working tree"
+msgstr "No es pot registrar l'estat de l'arbre de treball"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -14336,24 +14569,23 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
 msgid "only useful for debugging"
 msgstr "només útil per a la depuració"
 
-#: upload-pack.c:23
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opcions>] <directori>"
 
-#: upload-pack.c:1040
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
 
-#: upload-pack.c:1042
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "surt immediatament després de l'anunci inicial de referència"
 
-#: upload-pack.c:1044
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr ""
-"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
+msgstr "no intentis <directori>/.git/ si <directori> no és cap directori del Git"
 
-#: upload-pack.c:1046
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferència després de <n> segons d'inactivitat"
 
@@ -14375,6 +14607,15 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "imprimeix els missatges de depuració a stderr"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14385,20 +14626,65 @@ msgstr ""
 "algunes guies de concepte. Vegeu 'git help <ordre>' o\n"
 "'git help <concepte>' per a llegir sobre una subordre o concepte específic."
 
-#: http.c:338
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:137
+#, fuzzy, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "%s no admet --super-prefix"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "opció desconeguda: %s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:699
+#, fuzzy, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "s'ha produït un error en obrir «%s»: %s"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
 
-#: http.c:359
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
 
-#: http.c:368
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
 
-#: http.c:1768
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14409,11 +14695,20 @@ msgstr ""
 "  petició: %s\n"
 "   redirecció: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "s'està redirigint a %s"
 
+#: list-objects-filter-options.h:59
+msgid "args"
+msgstr "args"
+
+#: list-objects-filter-options.h:60
+#, fuzzy
+msgid "object filtering"
+msgstr "tipus d'objecte"
+
 #: common-cmds.h:9
 msgid "start a working area (see also: git help tutorial)"
 msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
@@ -14460,8 +14755,7 @@ msgstr "Registra els canvis al dipòsit"
 
 #: common-cmds.h:23
 msgid "Show changes between commits, commit and working tree, etc"
-msgstr ""
-"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc."
+msgstr "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc."
 
 #: common-cmds.h:24
 msgid "Download objects and refs from another repository"
@@ -14493,8 +14787,7 @@ msgstr "Obtén i integra amb un altre dipòsit o una branca local"
 
 #: common-cmds.h:31
 msgid "Update remote refs along with associated objects"
-msgstr ""
-"Actualitza les referències remotes juntament amb els objectes associats"
+msgstr "Actualitza les referències remotes juntament amb els objectes associats"
 
 #: common-cmds.h:32
 msgid "Reapply commits on top of another base tip"
@@ -14518,33 +14811,31 @@ msgstr "Mostra l'estat de l'arbre de treball"
 
 #: common-cmds.h:37
 msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr ""
-"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
+msgstr "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "data-de-caducitat"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "sigues més detallat"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "sigues més callat"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> xifres per presentar els SHA-1"
 
 #: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"actualitza l'índex amb la resolució de conflicte reusada si és possible"
+msgstr "actualitza l'índex amb la resolució de conflicte reusada si és possible"
 
 #: git-bisect.sh:54
 msgid "You need to start by \"git bisect start\""
@@ -14573,11 +14864,8 @@ msgstr "HEAD incorrecte - Cal un HEAD"
 
 #: git-bisect.sh:167
 #, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
-"vàlida>'."
+msgid "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-vàlida>'."
 
 #: git-bisect.sh:177
 msgid "won't bisect on cg-seek'ed tree"
@@ -14592,27 +14880,27 @@ msgstr "HEAD incorrecte - referència simbòlica estranya"
 msgid "Bad bisect_write argument: $state"
 msgstr "Paràmetre bisect_write incorrecte: $state"
 
-#: git-bisect.sh:262
+#: git-bisect.sh:246
 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr "Introducció de revisió errònia: $arg"
 
-#: git-bisect.sh:281
+#: git-bisect.sh:265
 #, sh-format
 msgid "Bad rev input: $bisected_head"
 msgstr "Entrada de revisió errònia: $bisected_head"
 
-#: git-bisect.sh:290
+#: git-bisect.sh:274
 #, sh-format
 msgid "Bad rev input: $rev"
 msgstr "Introducció de revisió errònia: $rev"
 
-#: git-bisect.sh:299
+#: git-bisect.sh:283
 #, sh-format
 msgid "'git bisect $TERM_BAD' can take only one argument."
 msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
 
-#: git-bisect.sh:322
+#: git-bisect.sh:306
 #, sh-format
 msgid "Warning: bisecting only with a $TERM_BAD commit."
 msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
@@ -14620,11 +14908,11 @@ msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
 msgid "Are you sure [Y/n]? "
 msgstr "N'esteu segur [Y/n]? "
 
-#: git-bisect.sh:340
+#: git-bisect.sh:324
 #, sh-format
 msgid ""
 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14633,7 +14921,7 @@ msgstr ""
 "Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
 "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
 
-#: git-bisect.sh:343
+#: git-bisect.sh:327
 #, sh-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -14644,16 +14932,16 @@ msgstr ""
 "Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
 "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
 
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
 msgid "We are not bisecting."
 msgstr "No estem bisecant."
 
-#: git-bisect.sh:421
+#: git-bisect.sh:405
 #, sh-format
 msgid "'$invalid' is not a valid commit"
 msgstr "'$invalid' no és una comissió vàlida"
 
-#: git-bisect.sh:430
+#: git-bisect.sh:414
 #, sh-format
 msgid ""
 "Could not check out original HEAD '$branch'.\n"
@@ -14662,25 +14950,29 @@ msgstr ""
 "No s'ha pogut agafar el HEAD original '$branch'.\n"
 "Proveu 'git bisect reset <comissió>'."
 
-#: git-bisect.sh:458
+#: git-bisect.sh:422
 msgid "No logfile given"
 msgstr "Cap fitxer de registre donat"
 
-#: git-bisect.sh:459
+#: git-bisect.sh:423
 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr "no es pot llegir $file per a reproducció"
 
-#: git-bisect.sh:480
+#: git-bisect.sh:444
 msgid "?? what are you talking about?"
 msgstr "?? de què parleu?"
 
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:458
 #, sh-format
 msgid "running $command"
 msgstr "s'està executant $command"
 
-#: git-bisect.sh:499
+#: git-bisect.sh:465
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -14689,11 +14981,11 @@ msgstr ""
 "el pas de bisecció ha fallat:\n"
 "el codi de sortida $res de '$command' és < 0 o >= 128"
 
-#: git-bisect.sh:525
+#: git-bisect.sh:491
 msgid "bisect run cannot continue any more"
 msgstr "el pas de bisecció no pot continuar més"
 
-#: git-bisect.sh:531
+#: git-bisect.sh:497
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -14702,40 +14994,20 @@ msgstr ""
 "el pas de bisecció ha fallat:\n"
 "'bisect_state $state' ha sortit amb el codi d'error $res"
 
-#: git-bisect.sh:538
+#: git-bisect.sh:504
 msgid "bisect run success"
 msgstr "pas de bisecció reeixit"
 
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "useu dos termes distintes"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term' no és un terme vàlid"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "no es pot usar l'ordre interna '$term' com a terme"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "no es pot canviar el significat del terme '$term'"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
 #, sh-format
 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
+msgstr "Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
 
-#: git-bisect.sh:636
+#: git-bisect.sh:567
 msgid "no terms defined"
 msgstr "cap terme definit"
 
-#: git-bisect.sh:653
+#: git-bisect.sh:584
 #, sh-format
 msgid ""
 "invalid argument $arg for 'git bisect terms'.\n"
@@ -14745,12 +15017,9 @@ msgstr ""
 "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
 
 #: git-merge-octopus.sh:46
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+msgid "Error: Your local changes to the following files would be overwritten by merge"
 msgstr ""
-"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar"
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar"
 
 #: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
@@ -14782,59 +15051,57 @@ msgstr "S'està intentant una fusió simple amb $pretty_name"
 
 #: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
-msgstr ""
-"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
+msgstr "La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 "You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
 msgstr ""
 "Resolgueu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --"
-"continue».\n"
+"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --continue».\n"
 "Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n"
-"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
-"executeu «git rebase --abort»."
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git "
+"rebase --abort»."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No s'ha pogut tornar a $head_name"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "S'ha aplicat el magatzem automàtic."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "No es pot emmagatzemar $stash_sha1"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
 
-#: git-rebase.sh:219
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-rebase.sh:223
+#, fuzzy
+msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sembla que git-am està en curs. No es pot fer «rebase»."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "No hi ha un «rebase» en curs?"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14842,7 +15109,7 @@ msgstr ""
 "Heu d'editar tots els conflictes de fusió i després\n"
 "marcar-los com a resolts fent servir git add"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14863,65 +15130,74 @@ msgstr ""
 "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
 "de valor."
 
-#: git-rebase.sh:480
-#, sh-format
-msgid "invalid upstream $upstream_name"
+#: git-rebase.sh:491
+#, fuzzy, sh-format
+msgid "invalid upstream '$upstream_name'"
 msgstr "font no vàlida $upstream_name"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: ja hi ha més d'una base de fusió"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: no hi ha cap base de fusió"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "No assenyala una comissió vàlida: $onto_name"
 
-#: git-rebase.sh:539
-#, sh-format
-msgid "fatal: no such branch: $branch_name"
+#: git-rebase.sh:553
+#, fuzzy, sh-format
+msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "fatal: no hi ha tal branca: $branch_name"
 
-#: git-rebase.sh:572
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "No es pot emmagatzemar automàticament"
 
-#: git-rebase.sh:577
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
 
-#: git-rebase.sh:581
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "Cometeu-los o emmagatzemeu-los."
 
-#: git-rebase.sh:601
+#: git-rebase.sh:618
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD està al dia."
+
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La branca actual $branch_name està al dia."
 
-#: git-rebase.sh:605
+#: git-rebase.sh:628
+#, fuzzy, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
+
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
 
-#: git-rebase.sh:616
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Canvis de $mb a $onto:"
 
-#: git-rebase.sh:625
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
+msgstr "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
 
-#: git-rebase.sh:635
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
@@ -14930,168 +15206,151 @@ msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear amb paràmetres no està implementat"
 
-#: git-stash.sh:102
+#: git-stash.sh:108
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: git-stash.sh:117
+#: git-stash.sh:123
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: git-stash.sh:132
+#: git-stash.sh:138
 msgid "Cannot save the untracked files"
 msgstr "No es poden desar els fitxers no seguits"
 
-#: git-stash.sh:152 git-stash.sh:165
+#: git-stash.sh:158 git-stash.sh:171
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: git-stash.sh:169
+#: git-stash.sh:175
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: git-stash.sh:172
+#: git-stash.sh:178
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
 
-#: git-stash.sh:185
+#: git-stash.sh:191
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: git-stash.sh:217
+#: git-stash.sh:229
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No es pot actualitzar $ref_stash amb $w_commit"
 
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:273
+#: git-stash.sh:281
 #, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-"       To provide a message, use git stash save -- '$option'"
+msgid "error: unknown option for 'stash push': $option"
 msgstr ""
-"error: opció desconeguda de 'stash save': $option\n"
-"       Per a proveir un missatge, useu git stash save -- '$option'"
 
-#: git-stash.sh:288
+#: git-stash.sh:295
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "No es poden usar --patch i --include-untracked o --all a la vegada."
 
-#: git-stash.sh:296
+#: git-stash.sh:303
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: git-stash.sh:301
+#: git-stash.sh:308
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: git-stash.sh:305
+#: git-stash.sh:312
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: git-stash.sh:306
+#: git-stash.sh:313
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
 
-#: git-stash.sh:334
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: git-stash.sh:482
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opció desconeguda: $opt"
 
-#: git-stash.sh:495
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "No s'ha trobat cap «stash»."
 
-#: git-stash.sh:502
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "S'han especificat massa revisions: $REV"
 
-#: git-stash.sh:517
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no és una referència vàlida"
 
-#: git-stash.sh:545
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no és una comissió de tipus magatzem"
 
-#: git-stash.sh:556
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no és una referència de magatzem"
 
-#: git-stash.sh:564
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "no s'ha pogut actualitzar l'índex"
 
-#: git-stash.sh:568
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No es pot aplicar un magatzem enmig d'una fusió"
 
-#: git-stash.sh:576
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
 
-#: git-stash.sh:578
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "No s'ha pogut desar l'arbre d'índex"
 
-#: git-stash.sh:587
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
 
-#: git-stash.sh:612
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "No es pot fer «unstage» dels fitxers modificats"
 
-#: git-stash.sh:627
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "L'índex no estava sense emmagatzemar."
 
-#: git-stash.sh:641
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
-msgstr ""
-"Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
+msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
 
-#: git-stash.sh:650
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} ($s) descartada"
 
-#: git-stash.sh:651
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
 
-#: git-stash.sh:659
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: git-stash.sh:738
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
 
 #: git-submodule.sh:181
 msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
-"treball"
+msgstr "El camí relatiu només es pot usar des del nivell superior de l'arbre de treball"
 
 #: git-submodule.sh:191
 #, sh-format
@@ -15132,31 +15391,25 @@ msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
 #: git-submodule.sh:247
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Es troba un directori de git per a '$sm_name' localment amb els remots:"
+msgstr "Es troba un directori de git per a '$sm_name' localment amb els remots:"
 
 #: git-submodule.sh:249
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
 "  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
+"use the '--force' option. If the local git directory is not the correct repo\n"
+"or you are unsure what this means choose another name with the '--name' option."
 msgstr ""
 "Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
 "  $realrepo\n"
-"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
-"correcte\n"
-"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
-"name'."
+"useu l'opció '--force'. Si el directori de git local no és el dipòsit correcte\n"
+"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--name'."
 
 #: git-submodule.sh:255
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-"S'està reactivant el directori de git local per al submòdul '$sm_name'."
+msgstr "S'està reactivant el directori de git local per al submòdul '$sm_name'."
 
 #: git-submodule.sh:267
 #, sh-format
@@ -15181,176 +15434,110 @@ msgstr "S'està entrant '$displaypath'"
 #: git-submodule.sh:362
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-"S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
+msgstr "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "--pathspec i --all són incompatibles"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"L'arbre de treball de submòdul '$displaypath' conté un directori .git\n"
-"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
-"useu '-f' per a descartar-les"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "S'ha netejat el directori '$displaypath'"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr ""
-"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
+msgstr "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
+"Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'"
 msgstr ""
-"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
-"camí de submòdul '$sm_path'"
+"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el camí de "
+"submòdul '$sm_path'"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching "
+"of that commit failed."
 msgstr ""
-"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
-"L'obtenció directa d'aquella comissió ha fallat."
+"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. L'obtenció "
+"directa d'aquella comissió ha fallat."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
+msgstr "No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
-"'$displaypath'"
+msgstr "L'execució de '$command $sha1' ha fallat en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
-"S'ha produït un error en recorre recursivament dins del camí de submòdul "
-"'$displaypath'"
+"S'ha produït un error en recorre recursivament dins del camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:840
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'opció --cached no es pot usar amb l'opció --files"
 
-#: git-submodule.sh:892
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode inesperat $mod_dst"
 
-#: git-submodule.sh:912
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Avís: $display_name no conté la comissió $sha1_src"
 
-#: git-submodule.sh:915
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Avís: $display_name no conté la comissió $sha1_dst"
 
-#: git-submodule.sh:918
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
 
-#: git-submodule.sh:1064
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-"S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'"
-
-#: git-submodule.sh:1136
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15381,10 +15568,8 @@ msgstr ""
 " r, reword = usa la comissió, però edita el missatge de comissió\n"
 " e, edit = usa la comissió, però atura't per a esmenar\n"
 " s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
-" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
-"comissió\n"
-" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
-"d'ordres\n"
+" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta comissió\n"
+" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n"
 " d, drop = elimina la comissió\n"
 "\n"
 "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
@@ -15395,8 +15580,7 @@ msgid ""
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 "\n"
-"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una "
-"comissió.\n"
+"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una comissió.\n"
 
 #: git-rebase--interactive.sh:175
 msgid ""
@@ -15406,7 +15590,7 @@ msgstr ""
 "\n"
 "Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15425,123 +15609,121 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: no és una comissió que es pugui escollir"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nom de comissió no vàlid: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avanç ràpid a $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "No es pot avançar ràpidament a $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "No es pot moure HEAD a $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "S'està refusant fer «squash» a una fusió: $sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Error en refer la fusió $sha1"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "No s'ha pogut escollir $sha1"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Aquest és el missatge de comissió núm. ${n}:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "El missatge de comissió núm. ${n} s'ometrà:"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Això és una combinació de $count comissió."
 msgstr[1] "Això és una combinació de $count comissions."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "No es pot escriure $fixup_msg"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "Això és una combinació de 2 comissions."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "No s'ha pogut aplicar $sha1... $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
 "This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
 "you are able to reword the commit."
 msgstr ""
-"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
-"$rest\n"
+"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... $rest\n"
 "Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n"
 "precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
 "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
 "comissió."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "S'ha aturat a $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "No es pot '$squash_style' sense una comissió prèvia"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "S'està executant: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "L'execució ha fallat: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "i ha fet canvis a l'índex o l'arbre de treball"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15552,7 +15734,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15567,29 +15749,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Ordre desconeguda: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Corregiu-ho usant «git rebase --edit-todo»."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
 
-#: git-rebase--interactive.sh:749
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "no s'ha pogut separar HEAD"
 
-#: git-rebase--interactive.sh:784
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:789
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15620,13 +15802,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:806
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
-"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
-"la comissió"
+"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar la comissió"
 
-#: git-rebase--interactive.sh:811
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15634,11 +15815,11 @@ msgstr ""
 "Teniu canvis no comesos en el vostre arbre de treball. \n"
 "Primer cometeu-los i després executeu «git rebase --continue» de nou."
 
-#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "No s'han pogut cometre els canvis «staged»."
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15652,40 +15833,44 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "No s'ha pogut executar l'editor"
 
-#: git-rebase--interactive.sh:869
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "No s'ha pogut agafar $switch_to"
 
-#: git-rebase--interactive.sh:874
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "No hi ha cap HEAD?"
 
-#: git-rebase--interactive.sh:875
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "No s'ha pogut crear el $state_dir temporal"
 
-#: git-rebase--interactive.sh:877
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "No s'ha pogut marcar com a interactiu"
 
-#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "No s'han pogut iniciar les comissions reescrites"
 
-#: git-rebase--interactive.sh:993
+#: git-rebase--interactive.sh:910
+msgid "Could not generate todo list"
+msgstr "no s'ha pogut escriure la llista per a fer"
+
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
 msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
 
-#: git-rebase--interactive.sh:998
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15695,7 +15880,7 @@ msgstr ""
 "No obstant, si elimineu tot, s'avortarà el «rebase».\n"
 "\n"
 
-#: git-rebase--interactive.sh:1005
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Nota que les comissions buides estan comentades"
 
@@ -15707,9 +15892,7 @@ msgstr "ús: $dashless $USAGE"
 #: git-sh-setup.sh:190
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr ""
-"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
-"treball"
+msgstr "No es pot canviar de directori a $cdup, el nivell superior de l'arbre de treball"
 
 #: git-sh-setup.sh:199 git-sh-setup.sh:206
 #, sh-format
@@ -15739,8 +15922,7 @@ msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
 
 #: git-sh-setup.sh:245
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
+msgstr "No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
 
 #: git-sh-setup.sh:248
 #, sh-format
@@ -15753,8 +15935,7 @@ msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
 
 #: git-sh-setup.sh:372
 msgid "You need to run this command from the toplevel of the working tree."
-msgstr ""
-"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
+msgstr "Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
 
 #: git-sh-setup.sh:377
 msgid "Unable to determine absolute path of git directory"
@@ -15835,7 +16016,7 @@ msgstr "Afegeix sense seguiment"
 msgid "No untracked files.\n"
 msgstr "Sense fitxers no seguits.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15843,7 +16024,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «staging»."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15851,7 +16032,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «stashing»."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15859,7 +16040,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «unstaging»."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15867,7 +16048,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per aplicar-se."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15875,17 +16056,16 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per descartar-se."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
+msgstr "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -15899,18 +16079,17 @@ msgstr ""
 "Les línies que comencin per %s seran suprimides.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 "Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
-"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició "
-"s'avorta\n"
+"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició s'avorta\n"
 "i el tros es deixa sense cap canvi.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
@@ -15921,14 +16100,12 @@ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+#: git-add--interactive.perl:1206
+msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
-"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
-"descartarà) [y/n]? "
+"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es descartarà) [y/n]? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15942,7 +16119,7 @@ msgstr ""
 "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15956,7 +16133,7 @@ msgstr ""
 "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15970,7 +16147,7 @@ msgstr ""
 "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15984,8 +16161,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15999,7 +16175,7 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16013,7 +16189,7 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16027,7 +16203,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16049,295 +16225,310 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Els trossos seleccionats no apliquen a l'índex\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "No s'ha aplicat res.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "s'està ignorant %s no fusionat\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Només s'han canviat els fitxers binaris.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "Sense canvis.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Actualització del pedaç"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Canvia el mode de «stage» [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Canvia el mode de «stash» [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Suprimeix «stash» [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Canvia el mode de «unstage» [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Suprimeix «Unstage» [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d,/%s,?]?"
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d,/%s,?]?"
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplica aquest tros a l'índex [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?"
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta aquest tros des de l'arbre de treball  [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d,/"
-"%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "No hi ha altres trossos on anar-hi\n"
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "ves a quin tros (<ret> per veure'n més)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "ves a quin tros? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número no vàlid: '%s'\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Només %d tros disponible.\n"
 msgstr[1] "Només %d trossos disponibles.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "Cerca per expressió regular? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Expressió regular de cerca mal formada %s: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "Sense tros previ\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "No hi ha tros següent\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Divideix en %d tros.\n"
 msgstr[1] "Divideix en %d trossos.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Reviseu les diferències"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 "revert        - revert staged set of changes back to the HEAD version\n"
 "patch         - pick hunks and update selectively\n"
 "diff          - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of "
-"changes\n"
+"add untracked - add contents of untracked files to the staged set of changes\n"
 msgstr ""
 "status        - mostra els camins amb canvis\n"
 "update        - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n"
 "revert        - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
 "patch         - selecciona trossos i actualitza'ls selectivament\n"
 "diff          - mostra la diferència entre HEAD i l'índex\n"
-"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
+"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis "
+"«staged»\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "manca --"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "desconegut --patch mode: %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument %s no vàlid, s'esperava --"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor no ha sortit correctament, avortant-ho tot"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
-msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
+msgid "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' conté el correu redactat.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases és incompatible amb altres opcions\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "No es pot executar git format-patch des de fora del dipòsit\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or configuration "
+"option)\n"
+msgstr ""
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Camp --suppress-cc desconegut: «%s»\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "--confirm setting desconegut: «%s»\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "avís: `:include:` no està suportat: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16352,12 +16543,12 @@ msgstr ""
 "    * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
 "    * Proporcionant l'opció --format-patch si volíeu especificar un rang.\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "S'ha produït un error en obrir el directori %s: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16366,7 +16557,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "avís: no s'han enviat pedaços\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16376,17 +16567,17 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "S'ha produït un error en obrir per escriptura %s: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16400,72 +16591,61 @@ msgstr ""
 "\n"
 "Netegeu el contingut del cos si no voleu enviar un resum.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "S'ha produït un error en obrir %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "S'ha produït un error en obrir %s: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "S'ha produït un error en obrir %s.final: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "El correu electrònic de resum està buit, s'omet\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Esteu segur que voleu usar <%s> [y/N]? "
 
-#: git-send-email.perl:815
-msgid ""
-"The following files are 8bit, but do not declare a Content-Transfer-"
-"Encoding.\n"
-msgstr ""
-"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
-"Encoding.\n"
+#: git-send-email.perl:868
+msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n"
+msgstr "Els fitxers següents són 8bit, però no declaren un Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
 "\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
-"want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to "
+"send.\n"
 msgstr ""
 "S'ha refusat a enviar perquè el pedaç\n"
 "\t%s\n"
 "perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si realment "
 "voleu enviar-lo.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr ""
-"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
+msgstr "A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr ""
-"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
-"cap)? "
+msgstr "S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha cap)? "
 
-#: git-send-email.perl:927 git-send-email.perl:935
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
@@ -16473,16 +16653,16 @@ msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:939
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
 
-#: git-send-email.perl:1260
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "el camí CA \"%s\" no existeix"
 
-#: git-send-email.perl:1335
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16509,133 +16689,198 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1350
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): "
 
-#: git-send-email.perl:1353
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Requereix resposta en enviar el correu"
 
-#: git-send-email.perl:1379
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP requerit no està correctament definit."
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "El servidor no admet STARTTLS! %s"
 
-#: git-send-email.perl:1431 git-send-email.perl:1435
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS ha fallat! %s"
 
-#: git-send-email.perl:1445
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
-"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
-"useu --smtp-debug."
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i useu --smtp-"
+"debug."
 
-#: git-send-email.perl:1463
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "S'ha produït un error en enviar %s\n"
 
-#: git-send-email.perl:1466
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1466
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1480
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1483
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1496
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "no es pot obrir el fitxer %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1563
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1549
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1597
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1622
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1728
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no s'ha pogut executar «%s»"
 
-#: git-send-email.perl:1735
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
 
-#: git-send-email.perl:1739
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
 
-#: git-send-email.perl:1766
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "no es pot enviar el missatge en 7 bits"
 
-#: git-send-email.perl:1774
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència no vàlida"
 
-#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: git-send-email.perl:1815
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
 
-#: git-send-email.perl:1831
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1835
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut EOF"
+
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. please use . "
+#~ "instead if you meant to match all paths"
+#~ msgstr ""
+#~ "es faran no vàlides les cadenes buides com especificacions de camí en versions "
+#~ "futures. Useu . en lloc d'això si volíeu coincidir amb tots els camins"
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "no s'ha pogut truncar a «%s»"
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "no s'ha pogut finalitzar «%s»"
+
+#~ msgid "could not close %s"
+#~ msgstr "no s'ha pogut tancar %s"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "La còpia del pedaç que ha fallat es troba en: %s"
+
+#~ msgid "Copied a misnamed branch '%s' away"
+#~ msgstr "S'ha copiat el nom de la branca mal anomenada «%s»"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "no té sentit crear 'HEAD' manualment"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "No se sap com clonar %s"
+
+#~ msgid "show ignored files"
+#~ msgstr "mostra els fitxers ignorats"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s no és un objecte de «%s» vàlid"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "No se sap com obtenir de %s"
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "'$term' no és un terme vàlid"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ "       To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "error: opció desconeguda de 'stash save': $option\n"
+#~ "       Per a proveir un missatge, useu git stash save -- '$option'"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "--pathspec i --all són incompatibles"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
+
+#~ msgid "Failed to recurse into submodule path '$sm_path'"
+#~ msgstr "S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'"
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n"
+
 #~ msgid "%%(trailers) does not take arguments"
 #~ msgstr "%%(trailers) no accepta paràmetres"
diff --git a/po/de.po b/po/de.po
index eef4897..793bd2a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
 "PO-Revision-Date: 2016-11-28 18:10+0100\n"
 "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
 "Language-Team: German <>\n"
@@ -66,7 +66,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelöstem Konflikt."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
@@ -485,7 +485,7 @@ msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
@@ -561,7 +561,7 @@ msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
@@ -619,11 +619,11 @@ msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "Pfad"
@@ -636,7 +636,7 @@ msgstr "keine Änderungen im angegebenen Pfad anwenden"
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "Anzahl"
 
@@ -686,79 +686,79 @@ msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporären Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "erweiterte Ausgaben"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
@@ -794,7 +794,7 @@ msgstr "Format"
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "Präfix"
 
@@ -802,11 +802,11 @@ msgstr "Präfix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "Datei"
 
@@ -838,8 +838,8 @@ msgstr "besser komprimieren"
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "Repository"
 
@@ -890,22 +890,22 @@ msgstr ""
 "Verneinende Muster werden in Git-Attributen ignoriert.\n"
 "Benutzen Sie '\\!' für führende Ausrufezeichen."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Keine binäre Suche mehr möglich!\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s ist kein gültiger Commit-Name"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -914,7 +914,7 @@ msgstr ""
 "Die Merge-Basis %s ist fehlerhaft.\n"
 "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -923,7 +923,7 @@ msgstr ""
 "Die Merge-Basis %s ist neu.\n"
 "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -932,7 +932,7 @@ msgstr ""
 "Die Merge-Basis %s ist %s.\n"
 "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -943,7 +943,7 @@ msgstr ""
 "git bisect kann in diesem Fall nicht richtig arbeiten.\n"
 "Vielleicht verwechselten Sie %s und %s Commits?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -960,31 +960,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benötigt"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -993,7 +993,7 @@ msgstr ""
 "Kein testbarer Commit gefunden.\n"
 "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1003,49 +1003,49 @@ msgstr[1] "(ungefähr %d Schritte)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
 msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents und --reverse funktionieren gemeinsam nicht."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern die Angabe eines "
 "endgültigen\n"
 "Commits"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
 "\"first-parent\"-Kette"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "Pfad %s nicht in %s"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kann Blob %s für Pfad '%s' nicht lesen"
@@ -1202,76 +1202,75 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "Konnte '%s' nicht öffnen"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Das Paket enthält diese Referenz:"
 msgstr[1] "Das Paket enthält diese %d Referenzen:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "Das Paket speichert eine komplette Historie."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Das Paket benötigt diese Referenz:"
 msgstr[1] "Das Paket benötigt diese %d Referenzen:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "\"rev-list\" abgebrochen"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Ungültiger Farbwert: %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "konnte %s nicht parsen"
@@ -1281,7 +1280,7 @@ msgstr "konnte %s nicht parsen"
 msgid "%s %s is not a commit!"
 msgstr "%s %s ist kein Commit!"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1399,72 +1398,72 @@ msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
 msgid "bad zlib compression level %d"
 msgstr "ungültiger zlib Komprimierungsgrad %d"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungültiger %s: '%s'"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
 "liegen."
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
 "nicht parsen."
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "Konnte '%s' nicht aufheben."
@@ -1486,24 +1485,29 @@ msgstr ""
 "bestehen\n"
 "und das Repository existiert."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "Prüfe Konnektivität"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "Konnte 'git rev-list' nicht ausführen"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "Fehler beim Schreiben nach rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF würde in %s durch LF ersetzt werden."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1512,12 +1516,12 @@ msgstr ""
 "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF würde in %s durch LF ersetzt werden."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF würde in %s durch CRLF ersetzt werden."
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1527,11 +1531,6 @@ msgstr ""
 "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF würde in %s durch CRLF ersetzt werden."
-
 #: date.c:116
 msgid "in the future"
 msgstr "in der Zukunft"
@@ -1647,21 +1646,25 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1670,22 +1673,22 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
 "übersprungen."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1693,22 +1696,27 @@ msgstr ""
 "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
 "erneut versuchen."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "Konnte Verzeichnis '%s' nicht öffnen."
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 "Cache für unversionierte Dateien ist auf diesem System oder\n"
 "für dieses Verzeichnis deaktiviert."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
@@ -1725,186 +1733,194 @@ msgstr "Filtere Inhalt"
 #: entry.c:435
 #, c-format
 msgid "could not stat file '%s'"
-msgstr "konnte Datei '%s' nicht lesen"
+msgstr "Konnte Datei '%s' nicht lesen."
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Remote-Repository ohne URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "Fehler am anderen Ende: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc benötigt multi_ack_detailed"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "Ungültige shallow-Zeile: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "Ungültige unshallow-Zeile: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow erwartet, %s bekommen"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "Ungültiger Commit %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "Gebe auf"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "Fertig"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollständig"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungültiger Pack-Header"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "Server unterstützt keine shallow-Clients"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "Server unterstützt multi_ack_detailed"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "Server unterstützt no-done"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "Server unterstützt multi_ack"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "Server unterstützt side-band-64k"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "Server unterstützt side-band"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Server unterstützt allow-tip-sha1-in-want"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Server unterstützt allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "Server unterstützt ofs-delta"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Server unterstützt Filter"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstützt kein --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstützt kein --shallow-exclude"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "Server unterstützt kein --deepen"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "kein übereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "keine solche Remote-Referenz %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
@@ -1927,17 +1943,18 @@ msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
@@ -2080,19 +2097,18 @@ msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
 msgid "name consists only of disallowed characters: %s"
 msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungültiges Datumsformat: %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "Mehrere Arten von Objekt-Filtern können nicht kombiniert werden."
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "Mehrere filter-specs können nicht kombiniert werden."
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "Ungültiger filter-spec Ausdruck '%s'."
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "Kann Remote-Repository für partielles Klonen nicht ändern."
 
 #: lockfile.c:151
 #, c-format
@@ -2123,8 +2139,8 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s"
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
@@ -2141,60 +2157,60 @@ msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
 msgid "error building trees"
 msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kann Objekt %s '%s' nicht lesen"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet für %s '%s'"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "Fehler beim Öffnen von '%s': %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "Fehler bei Ausführung des internen Merges"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Konnte %s nicht zur Datenbank hinzufügen"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2203,7 +2219,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2212,7 +2228,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2221,7 +2237,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2230,20 +2246,20 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "umbenennen"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "umbenannt"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2252,144 +2268,144 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
 "und \"%s\"->\"%s\" in Branch \"%s\"%s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (bleibt unaufgelöst)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
 "in %s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
 "%s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "Füge zusammengeführte Datei %s hinzu"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Füge stattdessen als %s hinzu"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "kann Objekt %s nicht lesen"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "Objekt %s ist kein Blob"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "ändern"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "geändert"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "Inhalt"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "hinzufügen/hinzufügen"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "automatischer Merge von %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "Submodul"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "Entferne %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "Datei/Verzeichnis"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "Verzeichnis/Datei"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
 "hinzu."
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "Füge %s hinzu"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "Geänderter Index: kann nicht mergen (geändert: %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "Bereits aktuell!"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
 msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurückgegeben"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
 
@@ -2413,17 +2429,17 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
@@ -2433,7 +2449,7 @@ msgstr ""
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Ungültiger %s Wert: '%s'"
@@ -2443,25 +2459,25 @@ msgstr "Ungültiger %s Wert: '%s'"
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
@@ -2469,17 +2485,17 @@ msgstr "Verwendung: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2573,7 +2589,7 @@ msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2582,7 +2598,7 @@ msgstr ""
 "index.version gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2591,22 +2607,22 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "Konnte '%s' nicht schließen"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
@@ -2627,18 +2643,18 @@ msgstr ""
 msgid "could not remove reference %s"
 msgstr "Konnte Referenz %s nicht löschen"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Konnte Referenz %s nicht entfernen: %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Konnte Referenzen nicht entfernen: %s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "entfernt"
 
@@ -2832,131 +2848,141 @@ msgstr "(HEAD losgelöst von %s)"
 msgid "(no branch)"
 msgstr "(kein Branch)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "Objekt %s fehlt für %s"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "fehlerhaftes Objekt bei '%s'"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "Ignoriere fehlerhafte Referenz %s"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "Missgebildeter Objektname %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt üblicherweise %s, nicht %s"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "Kein solcher Branch: '%s'"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
 "Branch"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (benutzen Sie \"%s\" für Details)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
 msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2966,12 +2992,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2986,58 +3012,63 @@ msgstr[1] ""
 "Ihr Branch und '%s' sind divergiert,\n"
 "und haben jeweils %d und %d unterschiedliche Commits.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
 "zusammenzuführen)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "Öffnen von /dev/null fehlgeschlagen"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 "Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
-"Sie können diese Warnung mit `git config advice.ignoredHook false` deaktivieren."
+"Sie können diese Warnung mit `git config advice.ignoredHook false` "
+"deaktivieren."
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr ""
 "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -3045,32 +3076,37 @@ msgstr ""
 "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
 "Versand (\"--signed push\") unterstützt"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "die Gegenseite unterstützt keine Push-Optionen"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "Revert"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "Cherry-Pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "interaktives Rebase"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Unbekannte Aktion: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3078,7 +3114,7 @@ msgstr ""
 "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3088,44 +3124,44 @@ msgstr ""
 "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
 "'git commit' ein"
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
+msgid "failed to finalize '%s'"
 msgstr "Fehler beim Fertigstellen von '%s'."
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
@@ -3133,20 +3169,20 @@ msgstr "%s: Vorspulen"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Konnte neue Index-Datei nicht schreiben"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "Konnte HEAD-Commit nicht auflösen."
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3177,17 +3213,126 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
+"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
+"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
+"diese explizit setzen. Führen Sie dazu den folgenden Befehl aus und folgen\n"
+"Sie den Anweisungen in Ihrem Editor, um die Konfigurationsdatei zu "
+"bearbeiten:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit\n"
+"ändern mit:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
+"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
+"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
+"diese explizit setzen:\n"
+"\n"
+"    git config --global user.name \"Ihr Name\"\n"
+"    git config --global user.email ihre@emailadresse.de\n"
+"\n"
+"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit "
+"ändern:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "Konnte neu erstellten Commit nicht nachschlagen."
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "Konnte neu erstellten Commit nicht analysieren."
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "losgelöster HEAD"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (Basis-Commit)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "Konnte HEAD nicht parsen."
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s ist kein Commit!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "Konnte Commit von HEAD nicht analysieren."
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "Konnte Commit-Autor nicht parsen."
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "Fehler beim Schreiben des Commit-Objektes."
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "Konnte Commit %s nicht parsen."
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "Konnte Eltern-Commit %s nicht parsen."
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3198,7 +3343,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3209,242 +3354,246 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "benötige HEAD für fixup"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kann '%s' nicht schreiben"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "Das ist die erste Commit-Beschreibung:"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Das ist Commit-Beschreibung #%d:"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengeführt."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "Commit %s hat keinen Eltern-Commit %d"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "Kann keine Commit-Beschreibung für %s bekommen."
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits übergeben"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s akzeptiert keine Argumente: '%s'"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "Fehlende Argumente für %s."
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungültige Zeile %d: %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "Konnte '%s' nicht lesen."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungültiger Schlüssel: %s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "Fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "Konnte HEAD nicht sperren"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflösen"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht öffnen"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "Kann '%s' nicht lesen: %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "Unerwartetes Dateiende"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "Konnte %s nicht aktualisieren."
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "Konnte '%s' nicht nach '%s' kopieren."
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "Konnte den Index nicht lesen."
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3460,11 +3609,11 @@ msgstr ""
 "\n"
 "ausführen.\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3482,17 +3631,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3503,59 +3652,54 @@ msgstr ""
 "Ihre Änderungen sind im Stash sicher.\n"
 "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "Konnte %s nicht aktualisieren."
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungültige Datei: '%s'"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungültige Inhalte: '%s'"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3566,38 +3710,38 @@ msgstr ""
 "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: unbehandelte Optionen"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: Fehler beim Vorbereiten der Commits"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "Unbenutzbare TODO-Liste: '%s'"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -3605,7 +3749,7 @@ msgstr ""
 "Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
 "Ignoriere."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3614,7 +3758,7 @@ msgstr ""
 "Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
 "Entfernte Commits (neu zu alt):\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3631,7 +3775,7 @@ msgstr ""
 "Warnungen zu ändern.\n"
 "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3642,21 +3786,26 @@ msgstr ""
 "'git rebase --continue' aus.\n"
 "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "Das Script wurde bereits umgeordnet."
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s' liegt außerhalb des Repositories."
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3679,6 +3828,11 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3690,76 +3844,146 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "Unbekannte Repository-Erweiterungen gefunden:"
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
+msgid "error opening '%s'"
+msgstr "Fehler beim Öffnen von '%s'."
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "Fehler beim Lesen von '%s'."
 
-#: setup.c:1052
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "Ungültiges gitfile-Format: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "Kein Pfad in gitfile: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "Kein Git-Repository: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' zu groß"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "Kein Git-Repository: '%s'"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "Kann nicht in Verzeichnis '%s' wechseln."
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "Konnte '%*s%s%s' nicht lesen."
+
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
+msgid "cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 "Kein Git-Repository (oder irgendein Elternverzeichnis bis zum Einhängepunkt "
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
 "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "fork fehlgeschlagen"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "setsid fehlgeschlagen"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "Pfad '%s' existiert nicht"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
 "Arbeitsverzeichnis unterstützt."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
@@ -3840,7 +4064,7 @@ msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
 
@@ -3864,7 +4088,7 @@ msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
 msgid "submodule '%s' has dirty index"
 msgstr "Submodul '%s' hat einen geänderten Index."
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3872,18 +4096,18 @@ msgstr ""
 "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
 "wird nicht unterstützt"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3894,20 +4118,20 @@ msgstr ""
 "'%s' nach\n"
 "'%s'\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "Konnte 'ls-files' nicht in .. starten"
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
@@ -3985,7 +4209,7 @@ msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ungültige --depth Option '%s'"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3994,7 +4218,7 @@ msgstr ""
 "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
 "Remote-Repository gefunden wurden:\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -4021,11 +4245,11 @@ msgstr ""
 "zum Versenden zu einem Remote-Repository.\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "Abbruch."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Konnte Referenz %s nicht lesen."
@@ -4046,7 +4270,7 @@ msgstr "leerer Dateiname in Tree-Eintrag"
 msgid "too-short tree file"
 msgstr "zu kurze Tree-Datei"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4057,7 +4281,7 @@ msgstr ""
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
 "wechseln."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4067,7 +4291,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4077,7 +4301,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4087,7 +4311,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4097,7 +4321,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4106,7 +4330,7 @@ msgstr ""
 "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4116,7 +4340,7 @@ msgstr ""
 "Dateien in diesen Verzeichnissen verloren gehen:\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4126,7 +4350,7 @@ msgstr ""
 "den Checkout entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4137,7 +4361,7 @@ msgstr ""
 "Checkout entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4147,7 +4371,7 @@ msgstr ""
 "den Merge entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4158,7 +4382,7 @@ msgstr ""
 "Merge entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4168,7 +4392,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4178,7 +4402,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4189,7 +4413,7 @@ msgstr ""
 "den Checkout überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4201,7 +4425,7 @@ msgstr ""
 "Checkout überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4211,7 +4435,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4221,7 +4445,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4231,7 +4455,7 @@ msgstr ""
 "den %s überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4242,12 +4466,12 @@ msgstr ""
 "%s überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4257,7 +4481,7 @@ msgstr ""
 "sind nicht aktuell:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4268,7 +4492,7 @@ msgstr ""
 "über einen partiellen Checkout überschrieben werden:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4279,7 +4503,7 @@ msgstr ""
 "über einen partiellen Checkout entfernt werden:\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4288,12 +4512,12 @@ msgstr ""
 "Kann Submodul nicht aktualisieren:\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "Abbruch\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "Checke Dateien aus"
 
@@ -4326,18 +4550,43 @@ msgstr "ungültige Portnummer"
 msgid "invalid '..' path segment"
 msgstr "ungültiges '..' Pfadsegment"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' existiert nicht."
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' zeigt nicht zurück auf '%s'"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "Konnte '%s' nicht zum Lesen öffnen."
@@ -4351,167 +4600,167 @@ msgstr "konnte nicht auf '%s' zugreifen"
 msgid "unable to get current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "Nicht zusammengeführte Pfade:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
 "markieren)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "zum Commit vorgemerkte Änderungen:"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
 "Arbeitsverzeichnis zu verwerfen)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
 "in den Submodulen)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "beide gelöscht:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "von uns hinzugefügt:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "von denen gelöscht:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "von denen hinzugefügt:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "von uns gelöscht:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "von beiden hinzugefügt:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "von beiden geändert:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "neue Datei:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "kopiert:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "gelöscht:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "geändert:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "umbenannt:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "Typänderung:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "unbekannt:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "nicht gemerged:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "neue Commits, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "geänderter Inhalt, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Ihr Stash hat gerade %d Eintrag"
 msgstr[1] "Ihr Stash hat gerade %d Einträge"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4519,114 +4768,114 @@ msgstr ""
 "Ändern oder entfernen Sie nicht die obige Zeile.\n"
 "Alles unterhalb von ihr wird ignoriert."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
 "wiederherzustellen)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo fehlt."
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "Keine Befehle ausgeführt."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
 msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (mehr Informationen in Datei %s)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "Keine Befehle verbleibend."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
 msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "Sie sind gerade beim Rebase."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
 "aus)"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
 "auszuchecken)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4634,138 +4883,138 @@ msgstr ""
 "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
 "'%s' im Gange ist."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
 "continue\" aus)"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
 "'%s'."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "Sie editieren gerade einen Commit während eines Rebase."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
 "nachzubessern)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
 "abgeschlossen sind)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
 "\" aus)"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
 "abzubrechen)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Sie sind gerade an einem Revert von Commit '%s'."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
 "aus)"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "Sie sind gerade bei einer binären Suche."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
 "zurückzukehren)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "HEAD losgelöst bei "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "HEAD losgelöst von "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "Noch keine Commits"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4776,32 +5025,32 @@ msgstr ""
 "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
 "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine Änderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4810,69 +5059,73 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 "(benutzen Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
 "Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
 "anzuzeigen)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "Noch keine Commits in "
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "unterschiedlich"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "voraus "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "Konnte '%s' nicht entfernen."
@@ -4886,7 +5139,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
@@ -4937,7 +5190,7 @@ msgstr ""
 "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
 "ignoriert:\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4947,7 +5200,7 @@ msgstr "Probelauf"
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
@@ -4965,7 +5218,9 @@ msgstr "versionierte Dateien aktualisieren"
 
 #: builtin/add.c:299
 msgid "renormalize EOL of tracked files (implies -u)"
-msgstr "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert -u)"
+msgstr ""
+"erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
+"-u)"
 
 #: builtin/add.c:300
 msgid "record only the fact that the path will be added later"
@@ -5078,10 +5333,10 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Meinten Sie vielleicht 'git add .'?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "Index-Datei beschädigt"
 
@@ -5133,66 +5388,66 @@ msgstr "Ungültiger Offset in der Zeitzone"
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
 "\" aus."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
 "Patches abzubrechen, führen Sie \"%s --abort\" aus."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "Patch ist leer."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
 "zurückzufallen."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen ..."
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5200,39 +5455,30 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "Fehler beim Schreiben des Commit-Objektes."
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
 "Terminal verbunden ist."
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -5240,35 +5486,36 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+"Benutzen Sie 'git am --show-current-patch', um den\n"
+"fehlgeschlagenen Patch zu sehen."
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5279,7 +5526,7 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5292,17 +5539,17 @@ msgstr ""
 "Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
 "diese zu akzeptieren."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5310,134 +5557,142 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungültiger Wert für --patch-format: %s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "an git-apply übergeben"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "den Patch, der gerade angewendet wird, anzeigen"
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5445,16 +5700,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5463,7 +5718,7 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
 
@@ -5485,8 +5740,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: Externes Archiv ohne URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: habe ACK/NAK erwartet, aber EOF bekommen"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5572,112 +5827,112 @@ msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Ursprungs-Commits nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format für maschinelle Auswertung"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "Unterschiede im Whitespace ignorieren"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 "eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
 "von Unterschieden verwenden"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -5691,18 +5946,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "Datei %s hat nur %lu Zeile"
 msgstr[1] "Datei %s hat nur %lu Zeilen"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
@@ -5999,17 +6254,17 @@ msgstr "nur nicht zusammengeführte Branches ausgeben"
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "Schüssel"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "Objekt"
 
@@ -6017,16 +6272,16 @@ msgstr "Objekt"
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "für die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
@@ -6130,7 +6385,7 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
 msgid "Need a repository to unbundle."
 msgstr "Zum Entpacken wird ein Repository benötigt."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -6138,7 +6393,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6146,68 +6401,68 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<Art> kann sein: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "Objektart anzeigen"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "Objektgröße anzeigen"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "ansprechende Anzeige des Objektinhaltes"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "Blob"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschädigten Objekten erlauben"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
 "Eingabe"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
 "--batch oder --batch-check)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
 
@@ -6227,7 +6482,7 @@ msgstr "alle Attribute einer Datei ausgeben"
 msgid "use .gitattributes only from the index"
 msgstr "nur .gitattributes vom Index verwenden"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "Dateinamen von der Standard-Eingabe lesen"
 
@@ -6235,7 +6490,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen"
 msgid "terminate input and output records by a NUL character"
 msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
@@ -6247,28 +6502,28 @@ msgstr "Eingabe-Pfade ohne Ãœbereinstimmungen anzeigen"
 msgid "ignore index when checking"
 msgstr "Index bei der Prüfung ignorieren"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "Die Option -z kann nur mit --stdin verwendet werden."
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "kein Pfad angegeben"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig."
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 "Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ist nur mit --verbose zulässig"
 
@@ -6328,9 +6583,9 @@ msgid "write the content to temporary files"
 msgstr "den Inhalt in temporäre Dateien schreiben"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "Zeichenkette"
 
@@ -6376,81 +6631,81 @@ msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
 msgid "path '%s': cannot merge"
 msgstr "Pfad '%s': kann nicht zusammenführen"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt."
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6473,7 +6728,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6500,163 +6755,163 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "Konfliktstil (merge oder diff3)"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "second guess 'git checkout <no-such-branch>'"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
 "ausgecheckt wurde, deaktivieren"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "Bei der Option --track muss ein Branchname angegeben werden."
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Vermisse Branchnamen; versuchen Sie -b"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6755,7 +7010,7 @@ msgstr "Wählen Sie Einträge zum Löschen"
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Tschüss.\n"
@@ -6778,11 +7033,11 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** Befehle ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "Was nun"
 
@@ -6812,8 +7067,8 @@ msgstr "interaktives Clean"
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6851,150 +7106,150 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "ein Bare-Repository erstellen"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "von einem lokalen Repository klonen"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "lokal keine harten Verweise verwenden, immer Kopien"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "als verteiltes Repository einrichten"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "Pfadspezifikation"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "Submodule im Klon initialisieren"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "Anzahl der parallel zu klonenden Submodule"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "Name"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "Tiefe"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "Zeit"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "Commit"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
 "Ausschluss eines Commits vertiefen"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -7002,42 +7257,42 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -7047,101 +7302,101 @@ msgstr ""
 "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
 "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
 "nicht ausgecheckt werden.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht."
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s' ...\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -7149,40 +7404,44 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
 "stattdessen file://"
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "file://"
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "file://"
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
 "ignoriere --local"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
@@ -7218,69 +7477,15 @@ msgstr "Abstand zwischen Spalten"
 msgid "--command must be the first argument"
 msgstr "Die Option --command muss an erster Stelle stehen."
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
-"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
-"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
-"diese explizit setzen. Führen Sie dazu den folgenden Befehl aus und folgen\n"
-"Sie den Anweisungen in Ihrem Editor, um die Konfigurationsdatei zu "
-"bearbeiten:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit\n"
-"ändern mit:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n"
-"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n"
-"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n"
-"diese explizit setzen:\n"
-"\n"
-"    git config --global user.name \"Ihr Name\"\n"
-"    git config --global user.email ihre@emailadresse.de\n"
-"\n"
-"Nachdem Sie das getan haben, können Sie Ihre Identität für diesen Commit "
-"ändern:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7290,7 +7495,7 @@ msgstr ""
 "machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
 "Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7305,11 +7510,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7325,62 +7530,62 @@ msgstr ""
 "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
 "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7388,38 +7593,38 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7434,7 +7639,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7449,7 +7654,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7459,7 +7664,7 @@ msgstr ""
 "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7472,164 +7677,170 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
 "vorhandenen Autor überein"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ungültiger ignored-Modus '%s'."
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "Die Optionen --long und -z sind inkompatibel."
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 "Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
 "werden."
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts für \"--amend\"."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
 "verwendet werden."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 "Die Optionen --include und --only können nur mit der Angabe von Pfaden "
 "verwendet werden."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "voraus/hinterher-Werte berechnen"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "Modus"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
 "all)"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
-msgstr "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. (Standard: traditional)"
+msgstr ""
+"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
+"(Standard: traditional)"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7637,212 +7848,189 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
-msgstr "Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
-
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "Konnte neu erstellten Commit nicht analysieren."
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "losgelöster HEAD"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (Basis-Commit)"
+msgstr ""
+"Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
 
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "'Signed-off-by:'-Zeile hinzufügen"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "Standard"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "Konnte Commit von HEAD nicht analysieren."
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -8072,22 +8260,24 @@ msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
 msgid "tag '%s' is really '%s' here"
 msgstr "Tag '%s' ist eigentlich '%s' hier"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "kein Tag entspricht exakt '%s'"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
-msgstr "Keine exakte Ãœbereinstimmung bei Referenzen oder Tags, Suche zum Beschreiben\n"
+msgstr ""
+"Keine exakte Ãœbereinstimmung bei Referenzen oder Tags, Suche zum "
+"Beschreiben\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "beendete Suche bei %s\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -8096,7 +8286,7 @@ msgstr ""
 "Keine annotierten Tags können '%s' beschreiben.\n"
 "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -8105,12 +8295,12 @@ msgstr ""
 "Keine Tags können '%s' beschreiben.\n"
 "Versuchen Sie --always oder erstellen Sie einige Tags."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu Commits durchlaufen\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -8119,94 +8309,94 @@ msgstr ""
 "mehr als %i Tags gefunden; führe die ersten %i auf\n"
 "Suche bei %s aufgegeben\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "Beschreibe %s\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gültiger Objekt-Name"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s ist weder ein Commit, noch ein Blob."
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "das Tag finden, das nach dem Commit kommt"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "alle Referenzen verwenden"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "jedes Tag verwenden, auch nicht-annotierte"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "immer langes Format verwenden"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "nur erstem Elternteil folgen"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "nur exakte Ãœbereinstimmungen ausgeben"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "Kennzeichen"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
 "\")"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken"
 "\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
 
@@ -8395,101 +8585,105 @@ msgstr "Refspec auf exportierte Referenzen anwenden"
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
 "befinden"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, und geänderte Tags aktualisieren"
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) auf "
 "Zeitbasis\n"
 "vertiefen"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "Verzeichnis"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8497,91 +8691,91 @@ msgstr ""
 "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "Konnte Remote-Referenz von HEAD nicht finden."
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "%s wurde zurückgewiesen, da Ursprungs-Commits von Repositories mit "
 "unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8590,52 +8784,59 @@ msgstr ""
 "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
 "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
 "wurde verweigert."
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Option \"%s\" wird ignoriert für %s\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Konnte nicht von %s anfordern"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
+"die in core.partialClone konfiguriert sind."
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8644,43 +8845,43 @@ msgstr ""
 "oder den Namen des Remote-Repositories an, von welchem neue\n"
 "Commits angefordert werden sollen."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Sie müssen den Namen des Tags angeben."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen und --depth schließen sich gegenseitig aus"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 "Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
 "Historie verwendet werden."
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
@@ -8749,7 +8950,7 @@ msgstr "Platzhalter als Tcl-String formatieren"
 msgid "show only <n> matched refs"
 msgstr "nur <n> passende Referenzen anzeigen"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "Formatfarben beachten"
 
@@ -8773,63 +8974,63 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
@@ -8875,37 +9076,37 @@ msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
 "\"git gc\" bereits ausgeführt wird"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Repositories wird für eine optimale Performance im\n"
 "Hintergrund komprimiert.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Projektarchivs wird für eine optimale Performance "
 "komprimiert.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8913,7 +9114,7 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8924,12 +9125,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -8938,255 +9139,255 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter '%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "Ãœbereinstimmungen hervorheben"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
 "den Dateinamen nur einmal oberhalb der Ãœbereinstimmungen aus dieser Datei "
 "anzeigen"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "keine Muster angegeben"
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflösen: %s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "keine Unterstützung von Threads, --threads wird ignoriert"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "Die Option --open-files-in-pager kann nur innerhalb des "
 "Arbeitsverzeichnisses verwendet werden."
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "Option wird mit --recurse-submodules nicht unterstützt."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 "Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
 "werden."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
 "verwendet werden."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -9194,38 +9395,38 @@ msgstr ""
 "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
 "[--] <Datei>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "Art"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "Art des Objektes"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "das Objekt in die Objektdatenbank schreiben"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "das Objekt von der Standard-Eingabe lesen"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "Datei wie sie ist speichern, ohne Filter"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
 "Fehlersuche in Git, erzeugen"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
 
@@ -9357,153 +9558,153 @@ msgstr "Für '%s' wurde der Alias '%s' angelegt."
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht öffnen"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "Objekt-Typen passen bei %s nicht zusammen"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "konnte erwartetes Objekt %s nicht empfangen"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "kann %d Byte nicht lesen"
 msgstr[1] "kann %d Bytes nicht lesen"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "zu frühes Dateiende"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfügbar waren"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket überschreitet die maximal erlaubte Größe"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "konnte '%s' nicht erstellen"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "Kann Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "Paketsignatur stimmt nicht überein"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "Paketversion %<PRIu32> nicht unterstützt"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "Dekomprimierung gab %d zurück"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr ""
 "Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "Unbekannter Objekt-Typ %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "Kann Paketdatei %s nicht lesen"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
 msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "kann %s nicht lesen"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "Kann existierendes Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ungültiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Fehler in Objekt"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
@@ -9573,77 +9774,81 @@ msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "Fehler beim Schließen der Paketdatei"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
+msgid "cannot write %s file '%s'"
+msgstr "Kann %s Datei '%s' nicht schreiben."
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
+msgid "cannot close written %s file '%s'"
+msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
+
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "Kann Paketdatei nicht speichern"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "Kann Indexdatei nicht speichern"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "kein Unterschied: %d Objekt"
 msgstr[1] "kein Unterschied: %d Objekte"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
 msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungültig"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
 
@@ -9829,120 +10034,120 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr "keine Datei zur direkten Bearbeitung angegeben"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<Optionen>] <Objekt>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "Ungültige Option für --decorate: %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kann Objekt %s nicht lesen."
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "Name des Ausgabeverzeichnisses ist zu lang."
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9953,229 +10158,229 @@ msgstr ""
 "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
 "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> anstatt '.patch' verwenden"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[<Präfix>] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
 "fehlend)"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "Forschrittsanzeige während der Erzeugung der Patches"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "Die Option --name-only kann nicht verwendet werden."
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "Die Option --name-status kann nicht verwendet werden."
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "Die Option --check kann nicht verwendet werden."
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "Erzeuge Patches"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10336,7 +10541,7 @@ msgstr ""
 "mit Rückkehrwert 2 beenden, wenn keine übereinstimmenden Referenzen\n"
 "gefunden wurden"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
 
@@ -10383,185 +10588,185 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "Leere mbox: '%s'"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<Optionen>] [<Commit>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "Schalter 'm' erfordert einen Wert."
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
 "hinzufügen"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "commit-msg Hook überprüfen"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (nichts zu quetschen)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Unbekannte Option für merge-recursive: -X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
 "abzuschließen.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10577,71 +10782,71 @@ msgstr ""
 "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
 "Sie dann das Ergebnis.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr ""
 "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nichts was wir in %s zusammenführen können: %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10649,7 +10854,7 @@ msgstr ""
 "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10657,117 +10862,117 @@ msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Sie können --squash nicht mit --no-ff kombinieren."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
 "werden."
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht möglich, breche ab."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s ...\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10925,72 +11130,72 @@ msgstr "%.*s ist zum Commit vorgemerkt"
 msgid "force move/rename even if target exists"
 msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "Ziel '%s' ist kein Verzeichnis"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "ungültige Quelle"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "kann Verzeichnis nicht in sich selbst verschieben"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "kann Verzeichnis nicht über Datei verschieben"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "Quellverzeichnis ist leer"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "nicht unter Versionskontrolle"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "Ziel existiert bereits"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "überschreibe '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Kann nicht überschreiben"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "mehrere Quellen für dasselbe Ziel"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "Zielverzeichnis existiert nicht"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, Quelle=%s, Ziel=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -11183,12 +11388,12 @@ msgstr "Konnte Notiz-Objekt nicht schreiben"
 msgid "the note contents have been left in %s"
 msgstr "Die Notiz-Inhalte wurden in %s belassen."
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kann '%s' nicht lesen"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
@@ -11441,7 +11646,7 @@ msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
@@ -11476,195 +11681,199 @@ msgstr ""
 "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
 "aufgetrennt."
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
 "Datei\n"
 "geschrieben wurden."
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "Ungültiger Wert für --missing."
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "Nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "Ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "Threads bei der Suche nach den besten Ãœbereinstimmungen bei Unterschieden "
 "verwenden"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "Behandlung für fehlende Objekte"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories packen"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
@@ -11692,15 +11901,19 @@ msgstr "Lösche doppelte Objekte"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "gelöschte Objekte melden"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "Objekte älter als <Zeit> verfallen lassen"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten Remote-Repositories einschränken"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 
@@ -11804,7 +12017,7 @@ msgstr "Siehe git-pull(1) für weitere Details."
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<Branch>"
@@ -11831,29 +12044,29 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash ist nur mit --rebase zulässig."
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
 "vorgemerkt sind."
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11863,7 +12076,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11880,15 +12093,15 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -12286,39 +12499,43 @@ msgstr "git rebase--helper [<Optionen>]"
 msgid "keep empty commits"
 msgstr "leere Commits behalten"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "Commits mit leerer Beschreibung erlauben"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "Rebase fortsetzen"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "Rebase abbrechen"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "Rebase-Skript erstellen"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "Commit-IDs in der TODO-Liste verkürzen"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "Commit-IDs in der TODO-Liste erweitern"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "die TODO-Liste prüfen"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "nicht erforderliche \"pick\"-Befehle auslassen"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "fixup/squash-Zeilen umordnen"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
 
@@ -12326,7 +12543,7 @@ msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12358,7 +12575,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12379,15 +12596,15 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Sie müssen ein Repository angeben."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel"
@@ -12923,90 +13140,90 @@ msgstr ""
 "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
 "Konfiguration."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "--no-reuse-delta an git-pack-objects übergeben"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "--no-reuse-object an git-pack-objects übergeben"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausführen"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects übergeben"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "Datumsangabe"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "Größe des Fensters für die Delta-Kompression"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "gleiches wie oben, aber die Speichergröße anstatt der\n"
 "Anzahl der Einträge limitieren"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "maximale Anzahl von Threads limitieren"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "maximale Größe für jede Paketdatei"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable und -A sind inkompatibel"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "Fehler beim Löschen von '%s'"
@@ -13089,11 +13306,11 @@ msgstr "Eltern-Commits eines Commits ändern"
 msgid "replace the ref if it exists"
 msgstr "die Referenz ersetzen, wenn sie existiert"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "das angegebene Format benutzen"
 
@@ -13152,103 +13369,108 @@ msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, meldet nur Fehler"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
 "<Pfade>'."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N kann nur mit -mixed benutzt werden"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "--exclude-promisor-objects und --missing können nicht kombiniert werden."
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "Das Filtern von Objekten erfordert --objects."
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "Ungültiger \"sparse\"-Wert '%s'."
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstützt keine Anzeige von Notizen"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
+msgstr ""
+"--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
 
 #: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -13351,10 +13573,6 @@ msgstr "Commit-Namen anhängen"
 msgid "preserve initially empty commits"
 msgstr "ursprüngliche, leere Commits erhalten"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "Commits mit leerer Beschreibung erlauben"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "redundante, leere Commits behalten"
@@ -13710,35 +13928,39 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollständiger Referenzname erwartet, %s erhalten"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "'submodule--helper print-default-remote' erwartet keine Argumente."
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13748,110 +13970,201 @@ msgstr ""
 "Repository\n"
 "sein eigenes verbindliches Upstream-Repository ist."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
 "Konfiguration."
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<Pfad>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul '%s'."
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr "Ausgabe über Submodul-Status unterdrücken"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
-msgstr "Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
+msgstr ""
+"Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "Rekursion in verschachtelte Submodule durchführen"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synchronisiere Submodul-URL für '%s'\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'."
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'."
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'."
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Rekursion in verschachtelte Submodule durchführen"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis\n"
+"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
+"löschen möchten)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
+"verwenden Sie '-f', um diese zu verwerfen."
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Verzeichnis '%s' bereinigt.\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen vorliegen"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "alle Submodule austragen"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
+"möchten."
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "Fortschrittsanzeige beim Klonen erzwingen"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13860,88 +14173,88 @@ msgstr ""
 "<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
 "<Tiefe>] --url <URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Überspringe nicht zusammengeführtes Submodul %s"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ãœberspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "Pfad zum Arbeitsverzeichnis"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout oder none"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 "Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
 "bei\n"
 "der angegebenen Anzahl von Commits."
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "Parallele Ausführungen"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 "ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
 "Historie (shallow) folgen soll"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "Fehlerhafter Wert für --update Parameter"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13950,20 +14263,20 @@ msgstr ""
 "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
 "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchführen"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstützt kein --super-prefix"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -14069,139 +14382,143 @@ msgstr "konnte Tag nicht signieren"
 msgid "unable to write tag file"
 msgstr "konnte Tag-Datei nicht schreiben"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "ungültiger Objekt-Typ"
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "Tagnamen auflisten"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "Tags löschen"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "Tags überprüfen"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Optionen für Erstellung von Tags"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "annotiertes Tag, benötigt eine Beschreibung"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "Tag-Beschreibung"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "annotiertes und GPG-signiertes Tag"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "das Tag ersetzen, wenn es existiert"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "Reflog erstellen"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Optionen für Auflistung der Tags"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "Liste der Tags in Spalten anzeigen"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "nur Tags ausgeben, die gemerged wurden"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column und -n sind inkompatibel"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "Die Option -n ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "nur eine -F oder -m Option ist erlaubt."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "zu viele Parameter"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "Entpacke Objekte"
 
@@ -14463,7 +14780,8 @@ msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
 #: builtin/update-index.c:1171
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
-"core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-Monitor\n"
+"core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-"
+"Monitor\n"
 "wirklich aktivieren möchten."
 
 #: builtin/update-index.c:1175
@@ -14474,7 +14792,8 @@ msgstr "Dateisystem-Monitor aktiviert"
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
-"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-Monitor\n"
+"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-"
+"Monitor\n"
 "wirklich deaktivieren möchten."
 
 #: builtin/update-index.c:1182
@@ -14551,8 +14870,8 @@ msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<Optionen>] <Pfad> [<Branch>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14563,29 +14882,37 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<Optionen>] <Pfad>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<Optionen>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -14594,107 +14921,187 @@ msgstr ""
 "Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> "
 "gelesen)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Bereite %s vor (Identifikation %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "<Branch> auschecken, auch wenn dieser bereits in einem anderen "
 "Arbeitsverzeichnis ausgecheckt ist"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "versuchen, eine Ãœbereinstimmung des Branch-Namens mit einem\n"
 "Remote-Tracking-Branch herzustellen"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B und --detach schließen sich gegenseitig aus"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
-msgstr "--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
+msgstr ""
+"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "Sperrgrund"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ist kein Arbeitsverzeichnis"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
+"entfernt werden."
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "Konnte Zielname aus '%s' nicht bestimmen."
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "Ziel '%s' existiert bereits."
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben, Sperrgrund: %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "Kann gesperrtes Arbeitsverzeichnisses nicht verschieben."
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "Fehler beim Verschieben von '%s' nach '%s'"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s' ist verändert, benutzen Sie --force zum Löschen"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "Fehler beim Löschen von '%s'"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert wurde"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen, Sperrgrund: %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen."
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
@@ -14711,25 +15118,25 @@ msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben"
 msgid "only useful for debugging"
 msgstr "nur nützlich für Fehlersuche"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "nach einem einzigen Request/Response-Austausch beenden"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "direkt nach der initialen Angabe der Commits beenden"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
 "ist"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
 
@@ -14753,6 +15160,20 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n"
+"           [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n"
+"           <Befehl> [<Argumente>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14764,22 +15185,67 @@ msgstr ""
 "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
 "Konzept zu erfahren."
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "Kein Namespace für --namespace angegeben.\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "Kein Präfix für --super-prefix angegeben.\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c erwartet einen Konfigurationsstring.\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "Kein Verzeichnis für -C angegeben.\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "Unbekannte Option: %s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
 "nicht unterstützt."
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14790,16 +15256,16 @@ msgstr ""
 "  gefragt nach: %s\n"
 "    umgeleitet: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "Leite nach %s um"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "Argumente"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "Filtern nach Objekten"
 
@@ -14917,23 +15383,23 @@ msgstr ""
 "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder "
 "verifizieren."
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "Verfallsdatum"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "Kein Effekt (Rückwärtskompatibilität)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "erweiterte Ausgaben"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "weniger Ausgaben"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
 
@@ -15172,7 +15638,7 @@ msgstr "Versuche einfachen Merge mit $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15188,43 +15654,43 @@ msgstr ""
 "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
 "führen Sie \"git rebase --abort\" aus."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Konnte nicht zu $head_name zurückgehen"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "Automatischen Stash angewendet."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kann $stash_sha1 nicht speichern."
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
 "werden."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -15232,7 +15698,7 @@ msgstr ""
 "Sie müssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelöst markieren"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -15253,77 +15719,77 @@ msgstr ""
 "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schützenswertes vorhanden ist."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "Ungültiger Upstream-Branch '$upstream_name'."
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: es gibt keine Merge-Basis"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "$onto_name zeigt auf keinen gültigen Commit"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "fatal: Branch/Commit '$branch_name' nicht gefunden"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "Kann automatischen Stash nicht erzeugen."
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Automatischen Stash erzeugt: $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD ist aktuell."
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD ist aktuell, Rebase erzwungen."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 "Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Änderungen von $mb zu $onto:"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
 "darauf neu anzuwenden ..."
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name zu $onto_name vorgespult."
@@ -15392,89 +15858,89 @@ msgstr "Kann den aktuellen Status nicht speichern"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "unbekannte Option: $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "Keine Stash-Einträge gefunden."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Zu viele Commits angegeben: $REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference ist keine gültige Referenz"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' ist kein \"stash\"-artiger Commit"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' ist keine \"stash\"-Referenz"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "Konnte den Index nicht aktualisieren."
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
 "benötigen."
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
-msgstr "Gelöscht ${REV} ($s)"
+msgstr "${REV} ($s) gelöscht"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
 
@@ -15575,74 +16041,17 @@ msgstr "Betrete '$displaypath'"
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "Pfadspezifikationen und --all sind inkompatibel."
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
-"möchten."
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"Arbeitsverzeichnis von Submodul in '$displaypath' enthält ein .git-"
-"Verzeichnis\n"
-"(benutzen Sie 'rm -rf' wenn Sie dieses wirklich mitsamt seiner Historie "
-"löschen\n"
-"möchten)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
-"verwenden Sie '-f', um diese zu verwerfen"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Verzeichnis '$displaypath' bereinigt."
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-"Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-"Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
-"entfernt."
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15651,12 +16060,12 @@ msgstr ""
 "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
 "'$sm_path' nicht finden."
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15665,84 +16074,79 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
 "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
 "fehlgeschlagen"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 "Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "unerwarteter Modus $mod_dst"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_src"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Synchronisiere Submodul-URL für '$displaypath'"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15797,7 +16201,7 @@ msgstr ""
 "\n"
 "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15816,83 +16220,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: kein Commit der gepickt werden kann"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Ungültiger Commit-Name: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Spule vor zu $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "Kann nicht zu $sha1 vorspulen"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Kann HEAD nicht auf $first_parent setzen"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Fehler beim Wiederholen des Merges von $sha1"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Konnte $sha1 nicht picken"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Das ist Commit-Beschreibung #${n}:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Das ist eine Kombination aus $count Commit."
 msgstr[1] "Das ist eine Kombination aus $count Commits."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Kann $fixup_msg nicht schreiben"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "Das ist eine Kombination aus 2 Commits."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Konnte $sha1... ($rest) nicht anwenden"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15909,31 +16313,31 @@ msgstr ""
 "sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
 "können."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Angehalten bei $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Führe aus: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ausführung fehlgeschlagen: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15946,7 +16350,7 @@ msgstr ""
 "ausführen."
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15962,29 +16366,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Unbekannter Befehl: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "Konnte HEAD nicht loslösen"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -16016,13 +16420,13 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 "Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
 "finden"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -16032,11 +16436,11 @@ msgstr ""
 "erneut\n"
 "aus."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -16050,44 +16454,44 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "Konnte Editor nicht ausführen."
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Konnte $switch_to nicht auschecken."
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "Kein HEAD?"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "Konnte nicht als interaktiven Rebase markieren."
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "Konnte neu geschriebene Commits nicht initialisieren."
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "Konnte TODO-Liste nicht erzeugen."
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
 msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -16097,7 +16501,7 @@ msgstr ""
 "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Leere Commits sind auskommentiert."
 
@@ -16253,7 +16657,7 @@ msgstr "unversionierte Dateien hinzufügen"
 msgid "No untracked files.\n"
 msgstr "Keine unversionierten Dateien.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -16262,7 +16666,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Hinzufügen zur Staging-Area markiert."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -16271,7 +16675,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Hinzufügen zum Stash markiert."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -16280,7 +16684,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Entfernen aus der Staging-Area markiert."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -16289,7 +16693,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Anwenden markiert."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -16298,19 +16702,19 @@ msgstr ""
 "Block\n"
 "direkt als zum Verwerfen markiert."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
 "Kurzanleitung.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -16324,7 +16728,7 @@ msgstr ""
 "Zeilen, die mit %s beginnen, werden entfernt.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -16335,7 +16739,7 @@ msgstr ""
 "werden,\n"
 "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
@@ -16346,14 +16750,14 @@ msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
 "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -16369,7 +16773,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -16383,7 +16787,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -16397,7 +16801,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -16414,7 +16818,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -16431,7 +16835,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16446,7 +16850,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16460,7 +16864,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16484,203 +16888,212 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "Nichts angewendet.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Nur Binärdateien geändert.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "Keine Änderungen.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Patch Aktualisierung"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Modusänderung stashen [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Löschung stashen [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Diesen Patch-Block stashen [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Modusänderung auf Index anwenden [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Löschung auf Index anwenden [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/"
-"%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/"
-"%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "Keine anderen Patch-Blöcke verbleibend\n"
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "zu welchem Patch-Block springen? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ungültige Nummer: '%s'\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
 msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "Suche nach regulärem Ausdruck? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "Kein vorheriger Patch-Block\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "Kein folgender Patch-Block\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "In %d Patch-Block aufgeteilt.\n"
 msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Diff überprüfen"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16699,88 +17112,96 @@ msgstr ""
 "diff          - Unterschiede zwischen HEAD und Index anzeigen\n"
 "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "-- fehlt"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Unbekannter --patch Modus: %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ungültiges Argument %s, erwarte --"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "Der Editor wurde unsauber beendet, breche alles ab."
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' enthält die verfasste E-Mail.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"'batch-size' und 'relogin' müssen gemeinsam angegeben werden (über Kommandozeile\n"
+"oder Konfigurationsoption)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16797,12 +17218,12 @@ msgstr ""
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
 "meinen\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16811,7 +17232,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "Warnung: Es wurden keine Patches versendet.\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16821,17 +17242,17 @@ msgstr ""
 "keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16846,32 +17267,27 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Fehler beim Öffnen von %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr ""
-"To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Fehler beim Öffnen von %s.final: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? "
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16879,11 +17295,11 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16897,22 +17313,22 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine "
 "existiert)? "
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -16920,18 +17336,18 @@ msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
 "[e]): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16960,135 +17376,156 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Diese E-Mail versenden? (Ja [y]|Nein [n]|Beenden [q]|Alle [a]): "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Server unterstützt kein STARTTLS! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS fehlgeschlagen! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
 "Konfiguration\n"
 "und benutzen Sie --smtp-debug."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "Kann Nachricht nicht als 7bit versenden."
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "Ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "konnte %s nicht öffnen: %s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
 
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "Ungültiger filter-spec Ausdruck '%s'."
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "Pfadspezifikationen und --all sind inkompatibel."
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der "
+#~ "Konfiguration entfernt."
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr ""
+#~ "To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n"
+
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
 #~ "please use . instead if you meant to match all paths"
@@ -17342,9 +17779,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
 #~ "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
 #~ "seiner Historie löschen möchten)"
 
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Fehler beim Einpacken von %s."
-
 #~ msgid "Your local changes would be overwritten by cherry-pick."
 #~ msgstr ""
 #~ "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
diff --git a/po/es.po b/po/es.po
index e5d42a9..4e99496 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-07 12:14-0500\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-15 21:31-0500\n"
 "Last-Translator: christopher.diaz.riv@gmail.com\n"
 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
 "Language: es\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: advice.c:62
 #, c-format
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
 
@@ -122,15 +122,15 @@ msgstr "--cached y --3way no se pueden utilizar juntas."
 
 #: apply.c:127
 msgid "--3way outside a repository"
-msgstr "--3way esta fuera de un repositorio"
+msgstr "--3way está fuera de un repositorio"
 
 #: apply.c:138
 msgid "--index outside a repository"
-msgstr "--index esta fuera de un repositorio"
+msgstr "--index está fuera de un repositorio"
 
 #: apply.c:141
 msgid "--cached outside a repository"
-msgstr "--cached esta fuera de un repositorio"
+msgstr "--cached está fuera de un repositorio"
 
 #: apply.c:821
 #, c-format
@@ -140,7 +140,7 @@ msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
 #: apply.c:830
 #, c-format
 msgid "regexec returned %d for input: %s"
-msgstr "regexec retorno %d para la entrada: %s"
+msgstr "regexec retornó %d para la entrada: %s"
 
 #: apply.c:904
 #, c-format
@@ -204,10 +204,10 @@ msgid_plural ""
 "components (line %d)"
 msgstr[0] ""
 "al header de git diff carece de información del nombre del archivo %d cuando "
-"lo remueve de la ruta principalcomponente (línea %d)"
+"lo remueve de la ruta principal componente (línea %d)"
 msgstr[1] ""
 "los headers de git diff carecen de información de los nombres de los "
-"archivos %d cuando los remueven de la ruta principalcomponentes (línea %d)"
+"archivos %d cuando los remueven de la ruta principal componentes (línea %d)"
 
 #: apply.c:1575
 #, c-format
@@ -278,7 +278,7 @@ msgstr "comienzo invalido de línea: '%c'"
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
-msgstr[1] "Hunk #%d tuvo exito en %d (%d líneas compensadas)."
+msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
 
 #: apply.c:3067
 #, c-format
@@ -291,7 +291,7 @@ msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
-"Mientras se busca:\n"
+"mientras se busca:\n"
 "%.*s"
 
 #: apply.c:3095
@@ -368,23 +368,23 @@ msgstr "la ruta %s ha sido renombrada/suprimida"
 #: apply.c:3516 apply.c:3687
 #, c-format
 msgid "%s: does not exist in index"
-msgstr "%s: no existe en el indice"
+msgstr "%s: no existe en el índice"
 
 #: apply.c:3525 apply.c:3695
 #, c-format
 msgid "%s: does not match index"
-msgstr "%s: no concuerda con el indice"
+msgstr "%s: no concuerda con el índice"
 
 #: apply.c:3560
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "el repositorio carece del blob necesario para regresar en un merge de tres-"
-"vias"
+"vías."
 
 #: apply.c:3563
 #, c-format
 msgid "Falling back to three-way merge...\n"
-msgstr "Retrocediendo en un merge de tres-vias...\n"
+msgstr "Retrocediendo en un merge de tres-vías...\n"
 
 #: apply.c:3579 apply.c:3583
 #, c-format
@@ -394,7 +394,7 @@ msgstr "no se pueden leer los contenidos actuales de '%s'"
 #: apply.c:3595
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
-msgstr "Fallo el merge en retroceso de tres-vias...\n"
+msgstr "Fallo el merge en retroceso de tres-vías...\n"
 
 #: apply.c:3609
 #, c-format
@@ -428,7 +428,7 @@ msgstr "ruta invalida '%s'"
 #: apply.c:3922
 #, c-format
 msgid "%s: already exists in index"
-msgstr "%s: ya existe en el indice"
+msgstr "%s: ya existe en el índice"
 
 #: apply.c:3925
 #, c-format
@@ -463,7 +463,7 @@ msgstr "Revisando el parche %s..."
 #: apply.c:4080
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
-msgstr "falta información del sha1 o es inútil para el submodulo %s"
+msgstr "falta información del sha1 o es inútil para el submódulo %s"
 
 #: apply.c:4087
 #, c-format
@@ -475,7 +475,7 @@ msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry fallo para la ruta '%s'"
@@ -483,7 +483,7 @@ msgstr "make_cache_entry fallo para la ruta '%s'"
 #: apply.c:4099
 #, c-format
 msgid "could not add %s to temporary index"
-msgstr "no se pudo anadir %s al índice temporal"
+msgstr "no se pudo añadir %s al índice temporal"
 
 #: apply.c:4109
 #, c-format
@@ -493,12 +493,12 @@ msgstr "no se pudo escribir un índice temporal para %s"
 #: apply.c:4247
 #, c-format
 msgid "unable to remove %s from index"
-msgstr "no se puede remover %s del indice"
+msgstr "no se puede remover %s del índice"
 
 #: apply.c:4282
 #, c-format
 msgid "corrupt patch for submodule %s"
-msgstr "parche corrupto para el submodulo %s"
+msgstr "parche corrupto para el submódulo %s"
 
 #: apply.c:4288
 #, c-format
@@ -534,11 +534,11 @@ msgstr "no es posible escribir el archivo '%s' modo %o"
 #: apply.c:4515
 #, c-format
 msgid "Applied patch %s cleanly."
-msgstr "Parche %s aplicado limpiamente"
+msgstr "Parche %s aplicado limpiamente."
 
 #: apply.c:4523
 msgid "internal error"
-msgstr "Error interno"
+msgstr "error interno"
 
 #: apply.c:4526
 #, c-format
@@ -550,9 +550,9 @@ msgstr[1] "Aplicando parche %%s con %d rechazos..."
 #: apply.c:4537
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
-msgstr "truncando el nombre de archivo .rej a %.*s.rej "
+msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
@@ -560,12 +560,12 @@ msgstr "no se puede abrir %s"
 #: apply.c:4559
 #, c-format
 msgid "Hunk #%d applied cleanly."
-msgstr "Hunk #%d aplicado limpiamente"
+msgstr "Hunk #%d aplicado limpiamente."
 
 #: apply.c:4563
 #, c-format
 msgid "Rejected hunk #%d."
-msgstr "hunk #%d rechazado"
+msgstr "Hunk #%d rechazado."
 
 #: apply.c:4673
 #, c-format
@@ -578,7 +578,7 @@ msgstr "input no reconocido"
 
 #: apply.c:4700
 msgid "unable to read index file"
-msgstr "no es posible leer el archivo indice"
+msgstr "no es posible leer el archivo índice"
 
 #: apply.c:4837
 #, c-format
@@ -597,7 +597,7 @@ msgstr[1] "%d errores de espacios en blanco aplastados"
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línea agrega errores de espacios en blanco."
-msgstr[1] "%d líneas agregan erroes de espacios en blanco."
+msgstr[1] "%d líneas agregan errores de espacios en blanco."
 
 #: apply.c:4878
 #, c-format
@@ -606,17 +606,17 @@ msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] ""
 "%d línea aplicada después de arreglar los errores de espacios en blanco."
 msgstr[1] ""
-"%d líneas aplicadas despues de arreglar los errores de espacios en blanco."
+"%d líneas aplicadas después de arreglar los errores de espacios en blanco."
 
 #: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
-msgstr "No es posible escribir el archivo indice"
+msgstr "No es posible escribir el archivo índice"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "ruta"
@@ -629,7 +629,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "num"
 
@@ -669,81 +669,81 @@ msgstr "aplicar un parche sin tocar el árbol de trabajo"
 msgid "accept a patch that touches outside the working area"
 msgstr "aceptar un parche que toca fuera del área de trabajo"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
-msgstr "intentar merge de tres-vias si el parche no aplica"
+msgstr "intentar merge de tres-vías si el parche no aplica"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construir un índice temporal basado en la información del índice incrustado"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
-msgstr "rutas están separadas con un carácter NULL "
+msgstr "rutas están separadas con un carácter NULL"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "acción"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "detectar líneas nuevas o modificadas que contienen errores de espacios en "
 "blanco"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "no espera al menos una línea del contexto"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "ser verboso"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
 "archivo"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "no confiar en el conteo de líneas en los headers del hunk"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
-msgstr "raiz"
+msgstr "raíz"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 
@@ -779,7 +779,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "formato del archivo"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "prefijo"
 
@@ -787,11 +787,11 @@ msgstr "prefijo"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponer prefijo a cada ruta en el archivo"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "carpeta"
 
@@ -801,7 +801,7 @@ msgstr "escribe el archivo en esta carpeta"
 
 #: archive.c:442
 msgid "read .gitattributes in working directory"
-msgstr "leer .gitatributes en el directorio de trabajo"
+msgstr "leer .gitattributes en el directorio de trabajo"
 
 #: archive.c:443
 msgid "report archived files on stderr"
@@ -813,7 +813,7 @@ msgstr "solo guardar"
 
 #: archive.c:445
 msgid "compress faster"
-msgstr "comprimir mas rapido"
+msgstr "comprimir mas rápido"
 
 #: archive.c:453
 msgid "compress better"
@@ -823,8 +823,8 @@ msgstr "comprimir mejor"
 msgid "list supported archive formats"
 msgstr "listar los formatos de carpeta soportados"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "repo"
 
@@ -838,11 +838,11 @@ msgstr "comando"
 
 #: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
-msgstr "ruta para el comando git-upload-archivo remoto "
+msgstr "ruta para el comando git-upload-archivo remoto"
 
 #: archive.c:468
 msgid "Unexpected option --remote"
-msgstr "opción inesperada --remote"
+msgstr "Opción inesperada --remote"
 
 #: archive.c:470
 msgid "Option --exec can only be used together with --remote"
@@ -875,31 +875,31 @@ msgstr ""
 "Los patrones negativos son ignorados en los atributos de git\n"
 "Usa '\\!' para comenzar literalmente con exclamación."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podemos bisecar mas!\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit valido %s"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 "La base de fisión %s esta mal.\n"
-"Esto quiere decir que el bug ha sido arreglado enter %s y [%s].\n"
+"Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -908,7 +908,7 @@ msgstr ""
 "La base de fisión %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -917,7 +917,7 @@ msgstr ""
 "La base de fisión %s es %s.\n"
 "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -928,15 +928,15 @@ msgstr ""
 "git bisect no puede trabajar bien en este caso.\n"
 "Tal vez confundió la revisión %s y %s?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
 "So we cannot be sure the first %s commit is between %s and %s.\n"
 "We continue anyway."
 msgstr ""
-"la base de fusion entre %s y [%s] tiene que ser saltada.\n"
-"Asi que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n"
+"la base de fusión entre %s y [%s] tiene que ser saltada.\n"
+"Así que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n"
 "Vamos a continuar de todas maneras."
 
 #: bisect.c:810
@@ -944,31 +944,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisectando: una base de fisión debe ser probada\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "una %s revisión es necesaria"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no se pudo leer el archivo '%s'"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "fallo leer las refs de bisect"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -977,7 +977,7 @@ msgstr ""
 "No se encontró commit que se pueda probar.\n"
 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -987,46 +987,46 @@ msgstr[1] "(aproximadamente %d pasos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisectando: falta %d revisión por probar después de esto %s\n"
-msgstr[1] "Bisectando: faltan %d revisiones por probar despues de esto %s\n"
+msgstr[1] "Bisectando: faltan %d revisiones por probar después de esto %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents y --reverse no se mezclan bien."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "no se puede usar --contents con el nombre de objeto commit final"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
-"--reverse y --first-parent juntos requieren especificar el ultimo commit"
+"--reverse y --first-parent juntos requieren especificar el último commit"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "fallo la configuración del camino de revisión"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
-"--reverse --first-parent jutnos requieren un rango a lo largo de la cadena "
+"--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
 "del primer padre"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hay una ruta %s en %s"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no se puede leer el blob %s para la ruta %s"
@@ -1127,7 +1127,7 @@ msgstr "No se puede forzar la actualización de la rama actual."
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "No se puede configurar el rastreo de información; el punto de partida '%s' "
-"no es una rama"
+"no es una rama."
 
 #: branch.c:235
 #, c-format
@@ -1178,7 +1178,7 @@ msgstr "'%s' ya ha sido marcado en '%s'"
 #: branch.c:382
 #, c-format
 msgid "HEAD of working tree %s is not updated"
-msgstr "la HEAD del árbol de trabajo %s no esta actualizada"
+msgstr "HEAD del árbol de trabajo %s no esta actualizada"
 
 #: bundle.c:34
 #, c-format
@@ -1190,76 +1190,75 @@ msgstr "'%s' no se ve como un archivo bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "no se pudo abrir '%s'"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Al repositorio le falta estos commits prerrequisito:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El bundle contiene esta referencia:"
 msgstr[1] "El bundle contiene estas %d referencias:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "El bundle registra una historia completa."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El bundle requiere esta referencia:"
 msgstr[1] "El bundle requiere estas %d referencias:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
-msgstr "no se pudo engendrar el pack-objetcts"
+msgstr "No se pudo crear los pack-objetcts"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
-msgstr "pack-objects muerio"
+msgstr "pack-objects murió"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
-msgstr "rev-list muerio"
+msgstr "rev-list murió"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencia '%s' es excluida por las opciones de rev-list"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento no reconocido: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
-msgstr "Rechazando crear un bundle vacio."
+msgstr "Rechazando crear un bundle vacío."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no se puede crear '%s'"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
-msgstr "index-pack murio"
+msgstr "index-pack murió"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "color inválido: %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "no se puede analizar %s"
@@ -1269,7 +1268,7 @@ msgstr "no se puede analizar %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s no es un commit!"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1307,7 +1306,7 @@ msgstr "mala línea de config %d en la entrada standard"
 #: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
-msgstr "mala línea de config %d en el submodulo-blob %s"
+msgstr "mala línea de config %d en el submódulo-blob %s"
 
 #: config.c:736
 #, c-format
@@ -1351,7 +1350,7 @@ msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
-"mal valor de config numérica '%s' para '%s' en el submodulo-blob %s: %s"
+"mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
 
 #: config.c:891
 #, c-format
@@ -1379,67 +1378,68 @@ msgstr "'%s' para '%s' no es una marca de tiempo válida"
 msgid "bad zlib compression level %d"
 msgstr "mala compresión zlib en nivel %d"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo invalido de creación de objetos: %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mala compresión pack en el nivel %d"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "no es posible analizar la configuración de la línea de comando"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "error desconocido ocurrió mientras se leían los archivos de configuración"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Invalido %s: '%s'"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
-"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"
+"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
+"defecto"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tiene múltiples valores"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat en %s fallo"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no se pudo configurar '%s' a '%s'"
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
@@ -1460,52 +1460,52 @@ msgstr ""
 "Por favor asegúrese que tiene los permisos de acceso correctos\n"
 "y que el repositorio existe."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "Verificando conectividad"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "No se pudo correr 'git rev-list'"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "fallo escribir a rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "fallo al cerrar la entrada standard de rev-list"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF será reemplazado por LF en %s."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
-"CRLF sera remplazado por LF en %s.\n"
+"CRLF será remplazado por LF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF sera remplazado por LF en %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF será reemplazado por CRLF en %s"
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
-"LF sera reemplazado por CRLF en %s.\n"
+"LF será reemplazado por CRLF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF sera reemplazado por CRLF en %s"
-
 #: date.c:116
 msgid "in the future"
 msgstr "en el futuro"
@@ -1609,7 +1609,8 @@ msgstr ""
 #: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'"
+msgstr ""
+"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
 
 #: diff.c:401
 #, c-format
@@ -1620,20 +1621,24 @@ msgstr ""
 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
-msgstr "digg externo murió, deteniendo en %s"
+msgstr "diff externo murió, deteniendo en %s"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S y --find-object son mutuamente exclusivas"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requiere exactamente un pathspec"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1642,22 +1647,22 @@ msgstr ""
 "Fallo al analizar parámetro de opción --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Fallo al analizar parámetro de opción --submodule: '%s'"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
-"detección de cambio de nombre inexacta fue saltada por haber muchos archivos"
+"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
-"solo se encontraron copias de rutas modificadas por haber muchos archivos"
+"solo se encontraron copias de rutas modificadas por haber muchos archivos."
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1665,20 +1670,25 @@ msgstr ""
 "tal vez quiera configurar la variable %s para por lo menos %d y volver a "
 "intentar el comando."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "no se pudo abrir el directorio '%s'"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "fallo al conseguir la información y nombre del kernel"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
-msgstr "Untracked cache esta desactivado en este sistema o ubicación"
+msgstr "Untracked cache esta desactivado en este sistema o ubicación."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no se pudo crear directorios para %s"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
@@ -1697,184 +1707,192 @@ msgstr "Filtrando contenido"
 msgid "could not stat file '%s'"
 msgstr "no se pudo establecer el archivo '%s'"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Remoto sin URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: lista poco profunda esperada"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "error remoto: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requiere multi_ack_detailed"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línea poco profunda invalida: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línea superficial inválida: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "objeto no encontrado: %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objeto: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "superficie no encontrada: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "se obtuvo %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit inválido %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
-msgstr "rindiendose"
+msgstr "rindiéndose"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "listo"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "se obtuvo %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcando %s como completa"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ya se tiene %s (%s)"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "error de protocolo: mal paquete de header"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no se puede quitar %s"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s fallo"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "error en demultiplexor de banda lateral"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "Servidor no soporta clientes superficiales"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "Servidor soporta ulti_ack_detailed"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "Servidor soporta no-done"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "Servidor soporta multi_ack"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "Servidor soporta side-band-64k"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "Servidor soporta side-band"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Servidor soporta allow-tip-sha1-in-want"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Servidor soporta allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "Servidor soporta ofs-delta"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Servidor soporta filtro"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versión de servidor es %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "Servidor no soporta --shalow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "Servidor no soporta --shalow-exclude"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "Servidor no soporta --deepen"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "no hay commits comunes"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: fetch fallo"
+msgstr "git fetch-pack: fetch fallo."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "no concuerda el head remoto"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existe ref remota %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Servidor no permite solicitudes de objetos inadvertidos %s"
@@ -1897,17 +1915,18 @@ msgstr "fallo al escribir la firma separada para '%s'"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora color invalido '%.*s' en log.graphColors"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "fallo al marcar '%s'"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
@@ -1936,7 +1955,7 @@ msgstr ""
 
 #: help.c:336
 msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Oh oh. Tu sistema no reporta ningún comando de Git"
+msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
 
 #: help.c:358
 #, c-format
@@ -2049,19 +2068,18 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nombre consiste solo de caracteres no permitidos: %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de fecha invalido: %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "no se pueden combinar múltiples tipos de objeto filtro"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "expresión filter-spec inválida '%s'"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "no se puede cambiar un clon parcial remoto promisor"
 
 #: lockfile.c:151
 #, c-format
@@ -2092,10 +2110,10 @@ msgstr "No se pudo crear '%s.lock': %s"
 msgid "failed to read the cache"
 msgstr "fallo al leer la cache"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
-msgstr "no es posible escribir el archivo indice"
+msgstr "no es posible escribir el archivo índice"
 
 #: merge-recursive.c:235
 msgid "(bad commit)\n"
@@ -2110,78 +2128,78 @@ msgstr "addinfo_cache fallo para la ruta '%s'"
 msgid "error building trees"
 msgstr "error construyendo árboles"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "fallo al crear la ruta '%s'%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": tal vez un conflicto D/F?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "rehusando perder el archivo rastreado en '%s'"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no se puede leer el objeto %s '%s'"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "se esperaba blob para %s '%s'"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "fallo al abrir '%s': %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "fallo al crear el enlace simbólico '%s': %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se que hacer con %06o %s '%s'"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "Fallo al ejecutar la fusión interna"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No es posible agregar %s a la base de datos"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
-"en el árbol"
+"en el árbol."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
-"permanece en el árbol"
+"permanece en el árbol."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2190,7 +2208,7 @@ msgstr ""
 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
 "dejada en el árbol, en %s."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2199,20 +2217,20 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol en %s."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "renombrar"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "renombrado"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s es un directorio en %s agregando como %s más bien"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2221,143 +2239,143 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
 "renombrar \"%s\"->\"%s\" en \"%s\"%s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (dejado sin resolver)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
 "%s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Renombrando %s a %s y %s a %s más bien"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "Agregar %s fusionado"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Agregando más bien como %s"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "no se pudo leer el objeto %s"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objeto %s no es un blob"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "modificar"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "modificado"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "contenido"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "agregar/agregar"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Saltado %s (fusionado como existente)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Auto-fusionando %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "submódulo"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "archivo/directorio"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "directorio/archivo"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
 "%s"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "�ndice sucio: no se puede fusionar (sucio: %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "¡Ya está actualizado!"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "falló la fusión de los árboles %s y %s"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "Fusionando:"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "se encontró %u ancestro común:"
 msgstr[1] "se encontraron %u ancestros comunes:"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
-msgstr "la fusión no devolvió ningun commit"
+msgstr "la fusión no devolvió ningún commit"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 
@@ -2378,18 +2396,18 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "No has terminado tus notas de fusión (%s existe)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "No se puede realizar commit, notas del árbol no inicializadas o no "
-"referenciadas."
+"referenciadas"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Mal valor para notes.rewriteMode: '%s'"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
@@ -2398,7 +2416,7 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Mal valor para %s: '%s'"
@@ -2408,27 +2426,27 @@ msgstr "Mal valor para %s: '%s'"
 msgid "unable to parse object: %s"
 msgstr "incapaz de analizar objeto: %s"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes del final del paquete (broken .idx?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset más allá del índice de fin de paquete para %s (índice truncado?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
@@ -2436,24 +2454,24 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-NUM"
 
 #: parse-options-cb.c:108
 #, c-format
 msgid "malformed object name '%s'"
-msgstr "nombre de objeto malformado '%s'"
+msgstr "nombre de objeto mal formado '%s'"
 
 #: path.c:891
 #, c-format
@@ -2463,7 +2481,7 @@ msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 #: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
-"Carácter de escape '\\' no permitido como ultimo carácter en el valor attr"
+"Carácter de escape '\\' no permitido como último carácter en el valor attr"
 
 #: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
@@ -2471,7 +2489,7 @@ msgstr "Solo una especificación 'attr' es permitida."
 
 #: pathspec.c:150
 msgid "attr spec must not be empty"
-msgstr "especificación attr no puede estar vacia"
+msgstr "especificación attr no puede estar vacía"
 
 #: pathspec.c:193
 #, c-format
@@ -2481,7 +2499,7 @@ msgstr "nombre de atributo %s invalido"
 #: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
-"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles  "
+"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
 
 #: pathspec.c:265
 msgid ""
@@ -2498,7 +2516,7 @@ msgstr "parámetro no válido para el prefijo 'magic pathspec'"
 #: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "magic pathspec invalido '%.*s' en '%s'"
+msgstr "Magic pathspec inválido '%.*s' en '%s'"
 
 #: pathspec.c:331
 #, c-format
@@ -2508,7 +2526,7 @@ msgstr "Falta ')' al final del magic pathspec en '%s'"
 #: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Magic pathspec '%c' en '%s' no implementado"
+msgstr "Magic pathspec '%c' no implementado en '%s'"
 
 #: pathspec.c:428
 #, c-format
@@ -2523,7 +2541,7 @@ msgstr "%s: '%s' está fuera del repositorio"
 #: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (nemotecnico: '%c')"
+msgstr "'%s' (nemotécnico: '%c')"
 
 #: pathspec.c:525
 #, c-format
@@ -2539,7 +2557,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2548,7 +2566,7 @@ msgstr ""
 "index.version configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2557,22 +2575,22 @@ msgstr ""
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "no se pudo cerrar '%s'"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no se pudo definir '%s'"
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no es posible abrir el directorio de git: %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible remover el vinculo: %s"
@@ -2580,7 +2598,7 @@ msgstr "no es posible remover el vinculo: %s"
 #: refs.c:706
 #, c-format
 msgid "Could not open '%s' for writing"
-msgstr "No sepudo abrir '%s' para escritura"
+msgstr "No se pudo abrir '%s' para escritura"
 
 #: refs.c:1850
 msgid "ref updates forbidden inside quarantine environment"
@@ -2591,18 +2609,18 @@ msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
 msgid "could not remove reference %s"
 msgstr "no se pudo remover la referencia %s"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no se pudo eliminar la referencia %s: %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no se pudo eliminar la referencia: %s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "desaparecido"
 
@@ -2634,12 +2652,12 @@ msgstr "color no reconocido: %%(color:%s)"
 #: ref-filter.c:129
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
-msgstr "valor entero esperado refname:lstrip=%s"
+msgstr "Valor entero esperado refname:lstrip=%s"
 
 #: ref-filter.c:133
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
-msgstr "valor entero esperado refname:rstrip=%s"
+msgstr "Valor entero esperado refname:rstrip=%s"
 
 #: ref-filter.c:135
 #, c-format
@@ -2714,7 +2732,7 @@ msgstr "argumento: %s no reconocido %%(if)"
 #: ref-filter.c:409
 #, c-format
 msgid "malformed field name: %.*s"
-msgstr "nombre malformado de campo: %.*s"
+msgstr "nombre mal formado de campo: %.*s"
 
 #: ref-filter.c:435
 #, c-format
@@ -2749,7 +2767,7 @@ msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
 #: ref-filter.c:639
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "formato: átomo %%(else) usado sin un átomo %%(then) "
+msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
 
 #: ref-filter.c:641
 #, c-format
@@ -2764,7 +2782,7 @@ msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
 #: ref-filter.c:709
 #, c-format
 msgid "malformed format string %s"
-msgstr "formato de cadena malformado %s"
+msgstr "formato de cadena mal formado %s"
 
 #: ref-filter.c:1313
 #, c-format
@@ -2774,7 +2792,7 @@ msgstr "(no hay rama, rebasando %s)"
 #: ref-filter.c:1316
 #, c-format
 msgid "(no branch, bisect started on %s)"
-msgstr "(no hay rama, comenzando bisectado en %s)"
+msgstr "(no hay rama, comenzando bisecado en %s)"
 
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
@@ -2796,129 +2814,139 @@ msgstr "(HEAD desacoplado de %s)"
 msgid "(no branch)"
 msgstr "(sin rama)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
-msgstr "objeto %s faltante para %s"
+msgstr "falta objeto %s para %s"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer falló en %s para %s"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
-msgstr "objeto malformado en '%s'"
+msgstr "objeto mal formado en '%s'"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorando referencia con nombre roto %s"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta átomo %%(end)"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
-msgstr "nombre de objeto malformado %s"
+msgstr "nombre de objeto mal formado %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No se pueden traer ambos %s y %s a %s"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s por lo general hace seguimiento a %s, no a %s"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s hace seguimiento tanto a %s como a %s"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "Error interno"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no apunta a ninguna rama"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existe tal rama: '%s'"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "no se ha configurado upstream para la rama '%s'"
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la rama '%s' no tiene remoto para enviar"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "refspecs del push para '%s' no incluyen '%s'"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no tiene destino (push.default es 'nada')"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
-msgstr "no se puede resolver push 'simple' para un destino unico"
+msgstr "no se puede resolver push 'simple' para un destino único"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n"
+msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Tu rama está actualizada con '%s'.\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (usa \"%s\" para detalles)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2928,11 +2956,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2947,56 +2975,61 @@ msgstr[1] ""
 "Tu rama y '%s' han divergido,\n"
 "y tienen %d y %d commits diferentes cada una respectivamente.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "tu rama actual parece estar rota"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "tu rama actual '%s' no tiene ningún commit todavía"
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent es incompatible con --bisect"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "falló al abrir /dev/null"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
-"El hook '%s' fue ifnorado porque no ha sido configurado como ejecutable.\n"
+"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "
 "false`."
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"flush packet inesperado mientras se leía estatus de desempaquetado remoto"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "desempaquetado remoto falló: %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "falló al firmar el certificado de push"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "el final receptor no soporta --signed push"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -3004,40 +3037,45 @@ msgstr ""
 "no se manda un certificado de push ya que el destino no soporta push firmado "
 "(--signed )"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "el destino no soporta push atómicos (--atomic)"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "el destino no soporta opciones de push"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mensaje de commit inválido, modo cleanup '%s'"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Acción desconocida: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
-"despues de resolver los conflictos, marca las rutas corregidas\n"
+"después de resolver los conflictos, marca las rutas corregidas\n"
 "con 'git add <rutas>' o 'git rm <rutas>'"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3047,43 +3085,43 @@ msgstr ""
 "con 'git add <rutas>' o 'git rm <rutas>'\n"
 "y haz un commit del resultado con 'git commit'"
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
-msgstr "No se pudo bloquear '%s'"
+msgstr "no se pudo bloquear '%s'"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
-msgstr "No se pudo escribir en '%s'"
+msgstr "no se pudo escribir en '%s'"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
-msgstr "No se pudo escribir EOL en '%s'"
+msgstr "no se pudo escribir EOL en '%s'"
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "Fallo al finalizar '%s'."
+msgid "failed to finalize '%s'"
+msgstr "falló al finalizar '%s'"
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
-msgstr "No se pudo leer '%s'"
+msgstr "no se pudo leer '%s'"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
-msgstr "Tus cambios locales serán sobreescritos por %s."
+msgstr "tus cambios locales serán sobreescritos por %s."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
-msgstr "Realiza un commit con tus cambios o aplica un stash para proceder."
+msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"
@@ -3091,20 +3129,20 @@ msgstr "%s: avance rápido"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
-msgstr "No se pudo resolver el commit de HEAD"
+msgstr "no se pudo resolver el commit de HEAD"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "no es posible actualizar el árbol de la caché"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3134,17 +3172,123 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "hook 'prepare-commit-msg' falló"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tu nombre y correo fueron configurados automáticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
+"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta "
+"el \n"
+"siguiente comando y sigue las instrucciones de tu editor\n"
+" para modificar tu archivo de configuración:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tu nombre y correo fueron configurados automáticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
+"Tu puedes suprimir este mensaje configurándolos de forma explicita: \n"
+"\n"
+"    git config --global user.name \"Tu nombre\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "no se pudo revisar el commit recién creado"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "no se pudo analizar el commit recién creado"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "no se pudo resolver HEAD tras crear el commit"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "HEAD desacoplado"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (commit-raíz)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "no se pudo analizar HEAD"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s no es un commit!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "no se pudo analizar el commit de HEAD"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "no es posible analizar el autor del commit"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falló al escribir el árbol"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "no se puede leer el mensaje del commit de '%s'"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "fallo al escribir el objeto commit"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
-msgstr "No se pudo analizar commit %s"
+msgstr "no se pudo analizar commit %s"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
-msgstr "No se pudo analizar el commit padre %s"
+msgstr "no se pudo analizar el commit padre %s"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3155,7 +3299,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3166,240 +3310,244 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Esta es una combinación de %d commits."
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "se necesita un HEAD para arreglar"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "no se pudo leer el mensaje de commit de HEAD"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no se puede escribir '%s'"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "Este es el mensaje del 1er commit:"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no se puede leer el mensaje del commit de %s"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
-msgstr "este es el mensaje del commit #%d:"
+msgstr "Este es el mensaje del commit #%d:"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
-msgstr "El mensaje del commit #%d sera saltado: "
+msgstr "El mensaje del commit #%d será saltado:"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "tu archivo índice no esta fusionado."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusión pero no se entrego la opción -m."
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "el commit %s no tiene un padre %d"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "línea principal especificada pero el commit %s no es una fusión."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no se puede obtener el mensaje de commit para %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no se puede analizar el commit padre %s"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
-msgstr "No se puede renombrar '%s' a '%s'"
+msgstr "no se puede renombrar '%s' a '%s'"
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no se pudo revertir %s... %s"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no se pudo aplicar %s... %s"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: fallo al leer el índice"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: fallo al refrescar el índice"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no acepta los argumentos: '%s'"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "faltan argumentos para para %s"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línea inválida %d: %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "no se puede  '%s' sin un commit previo"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "no se puede leer '%s'."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
-msgstr "hoja de instrucciones inutilízale: '%s'"
+msgstr "hoja de instrucciones inutilizable: '%s'"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "no se puede realizar cherry-pick durante un revert."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
-msgstr "no se puede realizar un revert durante un cherry-pick"
+msgstr "no se puede realizar un revert durante un cherry-pick."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "llave invalida: %s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor invalido para %s: %s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hoja de opciones mal formada: '%s'"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
-msgstr "un cherry-pick o rever ya esta en progreso"
+msgstr "un cherry-pick o revert ya esta en progreso"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
-msgstr "no se pudo crear un directorio secuenciador '%s' "
+msgstr "no se pudo crear un directorio secuenciador '%s'"
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "ningún cherry-pick o revert en progreso"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "no se puede abortar de una rama por nacer"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no se puede abrir '%s'"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no se puede leer '%s': %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "no se puede actualizar %s"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
-msgstr "no se pudo leer indice"
+msgstr "no se pudo leer índice"
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3409,16 +3557,16 @@ msgid ""
 "\n"
 msgstr ""
 "ejecución fallida: %s\n"
-"%sse puede arreglar el problema , y luego ejecutar\n"
+"%sPuedes arreglar el problema, y luego ejecutar\n"
 "\n"
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3435,17 +3583,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "no se puede guardar %s"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3453,61 +3601,56 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 "Aplicando autostash resultó en conflictos.\n"
-"Tus cambios estan seguros en el stash.\n"
+"Tus cambios están seguros en el stash.\n"
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Detenido en %s...  %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "no se puede leer orig-head"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "no se puede actualizar %s"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no se puede actualizar HEAD a %s"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede remover CHERRY_PICK_HEAD"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "no se puede arreglar un commit no existente"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo invalido: '%s'"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3518,45 +3661,45 @@ msgstr ""
 "un commit con estos\n"
 "primero y luego ejecuta 'git rebase --continue' de nuevo."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no se puede aplicar cherry-pick a un %s"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: mala revision"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "no se puede revertir como commit inicial"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: error preparando revisiones"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
-msgstr "lista de pendientes inutilízale: '%s'"
+msgstr "lista de pendientes inutilizable: '%s'"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
-"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
+"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3565,7 +3708,7 @@ msgstr ""
 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
 "Commits botados (empezando con el mas nuevo):\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3583,7 +3726,7 @@ msgstr ""
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3594,21 +3737,26 @@ msgstr ""
 "rebase --continue'.\n"
 "O se puede abortar el rebase con 'git rebase --abort'.\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no se pudo abrir '%s' para escritura"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
-msgstr "No se pudo analizar commit '%s'"
+msgstr "no se pudo analizar commit '%s'"
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s' está fuera del repositorio"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3631,6 +3779,11 @@ msgstr ""
 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opción '%s' debe venir antes de argumentos no opcionales"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3642,76 +3795,148 @@ msgstr ""
 "Use '--' para separar rutas de revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"no es posible configurar el directorio de trabajo usando una configuración "
+"inválida"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "esta operación debe ser realizada en un árbol de trabajo"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Se esperaba versión de git repo  <= %d, encontrada %d"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "se encontró extensión de repositorio desconocida:"
 
-#: setup.c:811
+#: setup.c:533
+#, c-format
+msgid "error opening '%s'"
+msgstr "error abriendo '%s'"
+
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "muy grande para ser un archivo .git: '%s'"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "error leyendo %s"
+
+#: setup.c:539
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "invalid gitfile format: %s"
+msgstr "formato gitfile inválido: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "no hay ruta en gitfile: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "no es un repositorio git: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' muy grande"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "no es un repositorio git: '%s'"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "no se puede aplicar chdir a '%s'"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "no se puede volver a cwd"
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
-"No es un repositorio git (ni ninguno de los directorios superiores): %s"
+"no es un repositorio git (ni ninguno de los directorios superiores): %s"
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "No se puede regresar a cwd"
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "fallo al determinar '%*s%s%s'"
 
-#: setup.c:1052
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "No se puede cambiar a '%s'"
+msgid "cannot change to '%s'"
+msgstr "no se puede cambiar a '%s'"
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"No es un repositorio git ( o ningún padre en el punto de montado %s)\n"
+"no es un repositorio git ( o ningún padre en el punto de montado %s)\n"
 "Parando en el límite del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
+"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
 "El dueño de los archivos tiene que tener permisos de lectura y escritura."
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "falló al abrir /dev/null o dup"
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "falló fork"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "falló setsid"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "repositorio de referencia '%s' como un checkout vinculado no es soportado "
 "todavía."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
@@ -3719,7 +3944,7 @@ msgstr "repositorio de referencia '% s' está injertado"
 #: sha1_name.c:422
 #, c-format
 msgid "short SHA1 %s is ambiguous"
-msgstr "SHA1 %s corta es ambigua"
+msgstr "SHA1 %s corto es ambiguao"
 
 #: sha1_name.c:433
 msgid "The candidates are:"
@@ -3787,7 +4012,7 @@ msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Fallo al resolver HEAD como un ref valido."
 
@@ -3811,7 +4036,7 @@ msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
 msgid "submodule '%s' has dirty index"
 msgstr "submódulo '%s' tiene un índice corrupto"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3819,18 +4044,18 @@ msgstr ""
 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
 "soportado"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no se pudo resolver el nombre para el submódulo '%s'"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no se pudo crear el directorio '%s'"
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3841,20 +4066,20 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
-msgstr "No pudo recursar en el submódulo '%s'"
+msgstr "no pudo recursar en el submódulo '%s'"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "no se pudo comenzar ls-files en .."
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG: string de ruta recibido no concuerda con cwd?"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree retornó un código %d inesperado"
@@ -3871,7 +4096,7 @@ msgstr "valor inválido para %s"
 #: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
-msgstr "no se pudo ejecutar el comando de remolque '%s'"
+msgstr "ejecución del comando de remolque '%s' falló"
 
 #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
 #: trailer.c:557
@@ -3911,7 +4136,7 @@ msgstr "el archivo %s no es un archivo regular"
 #: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
-msgstr "el archivo %s no puede ser escrito por el usuario "
+msgstr "el archivo %s no puede ser escrito por el usuario"
 
 #: trailer.c:1024
 msgid "could not open temporary file"
@@ -3932,7 +4157,7 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3941,7 +4166,7 @@ msgstr ""
 "La siguiente ruta de submódulo contiene cambios que no\n"
 "pueden ser encontrados en ningún remoto:\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3968,11 +4193,11 @@ msgstr ""
 "para hacer un push al remoto.\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "Abortando."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "No se pudo leer la referencia %s"
@@ -3993,18 +4218,18 @@ msgstr "nombre de archivo vacío en la entrada de árbol"
 msgid "too-short tree file"
 msgstr "archivo de árbol muy corto"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
-"Los cambios locales de los siguientes archivos serán sobrescritos al "
-"actualizar el árbol de trabajo:\n"
-"%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar "
+"Los cambios locales de los siguientes archivos serán sobrescritos por "
+"checkuot:\n"
+"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
 "ramas."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4014,7 +4239,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4022,9 +4247,9 @@ msgid ""
 msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos al "
 "fusionar:\n"
-"%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar."
+"%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4034,16 +4259,16 @@ msgstr ""
 "merge:\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
-"%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s."
+"%%sPor favor, confirma tus cambios o guárdalos antes de %s."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4052,7 +4277,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4062,7 +4287,7 @@ msgstr ""
 "seguimiento en ellos:\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4072,7 +4297,7 @@ msgstr ""
 "removidos al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4082,7 +4307,7 @@ msgstr ""
 "al actualizar el árbol de trabajo:\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4092,7 +4317,7 @@ msgstr ""
 "removidos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4102,7 +4327,7 @@ msgstr ""
 "al fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4112,7 +4337,7 @@ msgstr ""
 "removidos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4122,7 +4347,7 @@ msgstr ""
 "removidos al ejecutar %s:\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4133,7 +4358,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4144,7 +4369,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4154,7 +4379,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4164,7 +4389,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4174,7 +4399,7 @@ msgstr ""
 "sobrescritos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4184,12 +4409,12 @@ msgstr ""
 "por %s:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir"
+msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4199,7 +4424,7 @@ msgstr ""
 "actualizadas:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4210,7 +4435,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4221,36 +4446,36 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
-"No se puede actualizar le submodulo:\n"
+"No se puede actualizar le submódulo:\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "Revisando archivos"
 
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "nombre de URL invalido o falta sufijo '://'"
+msgstr "nombre de URL invalido o sufijo '://' faltante"
 
 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
 #, c-format
 msgid "invalid %XX escape sequence"
-msgstr "secuencia de escape %XX invalida "
+msgstr "secuencia de escape %XX invalida"
 
 #: urlmatch.c:215
 msgid "missing host and scheme is not 'file:'"
-msgstr "falta host y el esquema no es 'archivo':"
+msgstr "falta host y el esquema no es 'file:'"
 
 #: urlmatch.c:232
 msgid "a 'file:' URL may not have a port number"
@@ -4268,18 +4493,46 @@ msgstr "numero de puerto invalido"
 msgid "invalid '..' path segment"
 msgstr "segmento de ruta '..' invalido"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "fallo al leer '%s'"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+"'%s' en el árbol de trabajo principal no es el directorio del repositorio"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
+"trabajo"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' no existe"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' no es un archivo .git, código de error %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' no apunta de vuelta a '%s'"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no se pudo abrir '%s' para lectura y escritura"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no se pudo abrir '%s' para lectura"
@@ -4293,159 +4546,159 @@ msgstr "no es posible acceder '%s'"
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
-msgstr "rutas no fusionadas:"
+msgstr "Rutas no fusionadas:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
 "resolución)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "Cambios a ser confirmados:"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
 "commit)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
 "directorio de trabajo)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (confirmar o descartar el contenido sin seguimiento o modificado en los "
 "sub-módulos)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "ambos borrados:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "agregado por nosotros:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
-msgstr "borrados por ellso:"
+msgstr "borrados por ellos:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "agregado por ellos:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "borrado por nosotros:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "ambos agregados:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "ambos modificados:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "nuevo archivo:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "copiado:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "borrado:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "modificado:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "renombrado:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "cambio de tipo:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "desconocido:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "des-fusionado:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "nuevos commits, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "contenido modificado, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Tu stash actualmente tine %d entrada"
+msgstr[0] "Tu stash actualmente tiene %d entrada"
 msgstr[1] "Tu stash actualmente tiene %d entradas"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Submodulos cambiados pero no actualizados:"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Submodulos cambiados listos para realizar commit:"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4453,236 +4706,236 @@ msgstr ""
 "No modifique o borre la línea de encima.\n"
 "Todo lo que este por abajo será removido."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
-msgstr "tienes rutas no fusionadas"
+msgstr "Tienes rutas no fusionadas."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregla los conflictos y corre \"git commit\""
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
-msgstr "Estas en medio de una sesión am."
+msgstr "Estás en medio de una sesión am."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "El parche actual esta vacío."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" para saltar este parche)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no esta presente."
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "El ultimo comando realizado (%d comando realizado):"
-msgstr[1] "Los ultimos comandos realizados (%d comandos realizados):"
+msgstr[0] "El último comando realizado (%d comando realizado):"
+msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver mas en el archivo %s)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "No quedan mas comandos."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Siguiente comando a realizar (%d comando restante)"
-msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes="
+msgstr[0] "Siguiente comando a realizar (%d comando restante):"
+msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Estas aplicando un rebase de la rama '%s' en '%s."
+msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
-msgstr "Estas aplicando un rebase."
+msgstr "Estás aplicando un rebase."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
+"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
-msgstr "Estas dividiendo un commit durante un rebase."
+msgstr "Estás dividiendo un commit durante un rebase."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
 "continue\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"Estas editando un commit mientras se aplica un rebase de la rama '%s' en "
+"Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
 "'%s'."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
-msgstr "Estas editando un commit durante un rebase."
+msgstr "Estás editando un commit durante un rebase."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
 "cambios)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
-msgstr "Estas realizando un cherry-picking en el commit %s."
+msgstr "Estás realizando un cherry-picking en el commit %s."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
-msgstr "Estas revirtiendo el commit %s."
+msgstr "Estás revirtiendo el commit %s."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Estas aplicando un bisect, comenzando en la rama '%s'."
+msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
-msgstr "Estas aplicando un bisect."
+msgstr "Estás aplicando un bisect."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "En la rama "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
-msgstr "rebase interactivo en progreso; en"
+msgstr "rebase interactivo en progreso; en "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
-msgstr "rebase en progreso; en"
+msgstr "rebase en progreso; en "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
-msgstr "HEAD desacoplada en"
+msgstr "HEAD desacoplada en "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
-msgstr "HEAD desacoplada de"
+msgstr "HEAD desacoplada de "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Confirmación inicial"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
-msgstr "No hay commits todavia"
+msgstr "No hay commits todavía"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Archivos ignorados"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4693,31 +4946,31 @@ msgstr ""
 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos usted mismo (vea 'git help status')."
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Archivos no rastreados no son mostrados %s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4726,68 +4979,72 @@ msgstr ""
 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
 "(usa \"git add\" para hacerles seguimiento)\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
 "presentes\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
 "hacerles seguimiento)\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "diferente"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
-msgstr "detras"
+msgstr "detrás "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
-msgstr "adelante"
+msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no se puede %s: Tienes cambios sin marcar."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "fallo al desvincular '%s'"
@@ -4801,7 +5058,7 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "fallo la actualización de carpetas"
 
@@ -4816,7 +5073,7 @@ msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 
 #: builtin/add.c:233 builtin/rev-parse.c:888
 msgid "Could not read the index"
-msgstr "No se pudo leer el indice"
+msgstr "No se pudo leer el índice"
 
 #: builtin/add.c:244
 #, c-format
@@ -4850,7 +5107,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4860,7 +5117,7 @@ msgstr "dry run ( ejecución en seco)"
 msgid "interactive picking"
 msgstr "selección interactiva"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 
@@ -4894,7 +5151,7 @@ msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"
 
 #: builtin/add.c:306
 msgid "don't add, only refresh the index"
-msgstr "no agregar, solo actualizar el indice"
+msgstr "no agregar, solo actualizar el índice"
 
 #: builtin/add.c:307
 msgid "just skip files which cannot be added because of errors"
@@ -4936,7 +5193,7 @@ msgstr ""
 "Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
 "Clones del repositorio exterior no tendrán el contenido del \n"
 "repositorio embebido y no sabrán como obtenerla.\n"
-"Si quería agregar un submodulo, use:\n"
+"Si quería agregar un submódulo, use:\n"
 "\n"
 "\tgit submodule add <url> %s\n"
 "\n"
@@ -4984,10 +5241,10 @@ msgstr "Nada especificado, nada agregado.\n"
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Tal vez quiso decir 'git add .'?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 
@@ -5003,7 +5260,7 @@ msgstr "'%s' fue borrado por el hook de applypatch-msg"
 #: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
-msgstr "línea mal formada: '%s'."
+msgstr "Línea mal formada: '%s'."
 
 #: builtin/am.c:576
 #, c-format
@@ -5021,7 +5278,7 @@ msgstr "no se pudo analizar el parche '%s'"
 
 #: builtin/am.c:855
 msgid "Only one StGIT patch series can be applied at once"
-msgstr "Solo un parche StGIT puede ser aplicado de una vez "
+msgstr "Solo un parche StGIT puede ser aplicado de una vez"
 
 #: builtin/am.c:903
 msgid "invalid timestamp"
@@ -5039,61 +5296,61 @@ msgstr "offset de zona horaria inválido"
 msgid "Patch format detection failed."
 msgstr "Falló al detectar el formato del parche."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "fallo al crear el directorio '%s'"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
-msgstr "Fallo al dividir parches"
+msgstr "Fallo al dividir parches."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
-msgstr "no es posible escribir en el archivo indice"
+msgstr "no es posible escribir en el archivo índice"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
 "\"."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "El parche esta vacío."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "sangría no válida: %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no es posible analizar el commit %s"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Repositorio carece de los blobs necesarios para retroceder en una fusión de "
-"3-vías"
+"3-vías."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Usando la información del índice para reconstruir un árbol base..."
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5101,37 +5358,28 @@ msgstr ""
 "Editaste el parche a mano?\n"
 "No aplica a blobs guardados en su índice."
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "Retrocediento para parchar base y fusión de 3-vías..."
+msgstr "Retrocediendo para parchar base y fusión de 3-vías..."
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "Falló al fusionar en los cambios."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree falló al escribir el árbol"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
-msgstr "aplicando a un historial vacio"
-
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "fallo al escribir el objeto commit"
+msgstr "aplicando a un historial vacío"
 
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
-msgstr "no se puede continuar: %s no existe"
+msgstr "no se puede continuar: %s no existe."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "no se puede ser interactivo sin stdin conectado a un terminal"
+msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
@@ -5139,35 +5387,34 @@ msgstr "Cuerpo de commit es:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndice sucio: no se puede aplicar parches (sucio: %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Sin cambios -- parche ya aplicado."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche fallo en %s %.*s"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "La copia del parche que fallido se encuentra en: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5177,7 +5424,7 @@ msgstr ""
 "Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
 "ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5190,152 +5437,160 @@ msgstr ""
 "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
 "él."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No se pudo analizar el objeto '%s'."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
-msgstr "fallo al limpiar el indice"
+msgstr "fallo al limpiar el índice"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 "Parece haber movido HEAD desde el último fallo 'am'.\n"
-"No rebobinando a ORIG_HEAD "
+"No rebobinando a ORIG_HEAD"
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
-msgstr "valor invalido para --patch-format: %s"
+msgstr "Valor invalido para --patch-format: %s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "opción histórica -- no-op"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "permitir retroceso en fusión de 3-vías si es necesario"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "ser silencioso"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una línea de tijeras"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "pasarlo a través de git-apply"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "formatear el parche(s)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "sinónimos para --continue"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr "restaurar la rama original y abortar la operación de parchado."
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "abortar la operación de parchado pero mantener HEAD donde está."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "muestra el parche siendo aplicado."
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
-msgstr "commits con firma GPG"
+msgstr "Commits con firma GPG"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5343,16 +5598,16 @@ msgstr ""
 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
 "será removida. Por favor no la use más."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
-msgstr "fallo al leer el indice"
+msgstr "fallo al leer el índice"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5361,13 +5616,13 @@ msgstr ""
 "Directorio extraviado %s encontrado.\n"
 "Use \"git am --abort\" para borrarlo."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operación de resolución no está en progreso, no vamos a continuar."
 
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<opciones>] [<parch>...]"
+msgstr "git apply [<opciones>] [<parche>...]"
 
 #: builtin/archive.c:17
 #, c-format
@@ -5383,8 +5638,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: Remote sin URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: se esperaba ACK/NAK, se obtuvo EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5414,7 +5669,7 @@ msgstr "git bisect--helper --bisect-clean-state"
 #: builtin/bisect--helper.c:46
 #, c-format
 msgid "'%s' is not a valid term"
-msgstr "'%s' no es un término válido."
+msgstr "'%s' no es un término válido"
 
 #: builtin/bisect--helper.c:50
 #, c-format
@@ -5470,107 +5725,107 @@ msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> están documentadas en git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "No tratar commits raíces como extremos (Default: off)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Mostrar estadísticas de costo de trabajo"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Forzar el reporte de progreso"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Mostrar la puntuación de salida de las entradas de blame"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "Mostrar nombre original del archivo (Default: auto)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostrar número de línea original (Default: off)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Mostrar en un formato diseñado para consumo de máquina"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostrar en formato porcelana con información de commit por línea"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostrar timestamp en formato raw (Default: off)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Suprimir nombre del autor y timestamp (Default: off)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr "Mostrar en cambio el email del autor (Default: off)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "Ignorar diferencias de espacios en blanco"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Usar un heurístico experimental para mejorar los diffs"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "Ocupo más ciclos para encontrar mejoras resultados"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Usar contenido de <archivo> como imagen final"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "puntaje"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "Encontrar copias de líneas entre y a través de archivos"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "Encontrar movimientos de líneas entre y a través de archivos"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 
@@ -5582,18 +5837,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "hace 4 años, 11 meses"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "archivo %s tiene solo %lu línea"
 msgstr[1] "archivo %s tiene solo %lu líneas"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
@@ -5742,7 +5997,7 @@ msgstr "Copiado de rama fallido"
 #: builtin/branch.c:517
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
-msgstr "Copia creada de la rama malnombrada '%s' "
+msgstr "Copia creada de la rama malnombrada '%s'"
 
 #: builtin/branch.c:520
 #, c-format
@@ -5779,7 +6034,7 @@ msgstr ""
 
 #: builtin/branch.c:586
 msgid "Generic options"
-msgstr "Opciones genericas"
+msgstr "Opciones genéricas"
 
 #: builtin/branch.c:588
 msgid "show hash and subject, give twice for upstream branch"
@@ -5787,7 +6042,7 @@ msgstr "mostrar hash y tema, dar dos veces para rama upstream"
 
 #: builtin/branch.c:589
 msgid "suppress informational messages"
-msgstr "Suprimir mensajes informativos"
+msgstr "suprimir mensajes informativos"
 
 #: builtin/branch.c:590
 msgid "set up tracking mode (see git-pull(1))"
@@ -5839,7 +6094,7 @@ msgstr "borrar ramas totalmente fusionadas"
 
 #: builtin/branch.c:609
 msgid "delete branch (even if not merged)"
-msgstr "borar rama (incluso si no esta fusionada)"
+msgstr "borrar rama (incluso si no esta fusionada)"
 
 #: builtin/branch.c:610
 msgid "move/rename a branch and its reflog"
@@ -5885,17 +6140,17 @@ msgstr "muestra solo ramas que no han sido fusionadas"
 msgid "list branches in columns"
 msgstr "muestra las ramas en columnas"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "clave"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "nombre del campo por el cuál ordenar"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "objeto"
 
@@ -5903,16 +6158,16 @@ msgstr "objeto"
 msgid "print only branches of the object"
 msgstr "imprimir sólo las ramas del objeto"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "ordenamiento y filtrado son case-insensitive"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no encontrado abajo de refs/heads!"
 
@@ -5997,7 +6252,7 @@ msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
-"La opción --set-upstream ya no es soportada. Considere usar '--track' o '--"
+"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
 "set-upstream-to' en cambio."
 
 #: builtin/bundle.c:45
@@ -6013,7 +6268,7 @@ msgstr "Se necesita un repositorio para agrupar."
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -6021,7 +6276,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6029,64 +6284,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puede ser: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "mostrar el tamaño del objeto"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "salir con cero cuando no haya error"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "realizar pretty-print del contenido del objeto"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "use una ruta específica para --textconv/--filters"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
-msgstr "salida buffer --batch "
+msgstr "salida buffer --batch"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr "mostrar info y content de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "mostrar info de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos los objetos con --batch o --batch-check"
 
@@ -6106,7 +6361,7 @@ msgstr "reportar todos los atributos configurados en el archivo"
 msgid "use .gitattributes only from the index"
 msgstr "use .gitattributes solo desde el índice"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "leer nombres de archivos de stdin"
 
@@ -6114,7 +6369,7 @@ msgstr "leer nombres de archivos de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registros de entrada y salida con un carácter NUL"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
@@ -6126,27 +6381,27 @@ msgstr "mostrar rutas de entrada que no concuerdan"
 msgid "ignore index when checking"
 msgstr "ignorar el índice cuando se revise"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "no se puede especificar los nombres de rutas con --stdin"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z sólo tiene sentido con --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "ruta no especificada"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet solo es válido con un nombre de ruta único"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "no se puede tener ambos --quiet y --verbose"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching sólo es válida con --verbose"
 
@@ -6177,7 +6432,7 @@ msgstr "stage tiene que estar entre 1 y 3 o all"
 
 #: builtin/checkout-index.c:159
 msgid "check out all files in the index"
-msgstr "revisar todos los archivos en el indice"
+msgstr "revisar todos los archivos en el índice"
 
 #: builtin/checkout-index.c:160
 msgid "force overwrite of existing files"
@@ -6206,9 +6461,9 @@ msgid "write the content to temporary files"
 msgstr "escribir el contenido en un archivo temporal"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "string"
 
@@ -6253,80 +6508,80 @@ msgstr "ruta '%s' no tiene versiones necesarias"
 msgid "path '%s': cannot merge"
 msgstr "ruta '%s': no se puede fusionar"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusión a '%s'"
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' no puede ser usada con rutas actualizadas"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' no puede ser usado con %s"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "no se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
+msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no esta fusionada"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "necesita resolver su índice actual primero"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No se puede hacer reflog para '%s': %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "no es posible actualizar  HEAD"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Rama reiniciada y cambiada a '%s'\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Cambiado a nueva rama '%s'\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d más.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6344,12 +6599,12 @@ msgstr[0] ""
 "\n"
 "%s\n"
 msgstr[1] ""
-"Peligro: está saliendo %d commits antrás, no está conectado\n"
+"Peligro: está saliendo %d commits atrás, no está conectado\n"
 "a ninguna rama:\n"
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6376,160 +6631,160 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
-msgstr "error interno en camino de reivison"
+msgstr "error interno en camino de revisión"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "La posición previa de HEAD era"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
-msgstr "Estas en una rama por nacer"
+msgstr "Estás en una rama por nacer"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "solo una referencia esperada, %d entregadas."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia invalida: %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referencia no es n árbol: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "rutas no pueden ser usadas con cambios de rama"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no puede ser usado con cambios de ramas"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' no puede ser usado con '%s'"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No se puede cambiar rama a un '%s' sin commits"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "rama"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "configurar info de upstream para una rama nueva"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "nueva-rama"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "hacer checkout a  nuestra versión para archivos sin fusionar"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "hacer checkout a su versión para los archivos sin fusionar"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar una fusión de tres vías con la rama nueva"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "conflicto de estilos (merge o diff3)"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitar pathspecs a dispersar entradas solamente"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B y --orphan son mutuamente exclusivas"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Falta nombre de rama; prueba -b"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
-msgstr "Especificación de ruta invalida"
+msgstr "especificación de ruta invalida"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6628,7 +6883,7 @@ msgstr "Seleccionar objetos para borrar"
 msgid "Remove %s [y/N]? "
 msgstr "Borrar %s [y/N]? "
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"
@@ -6651,18 +6906,18 @@ msgstr ""
 "help                - esta ventana\n"
 "?                   - ayuda para selección de opciones"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "Ahora que"
 
 #: builtin/clean.c:832
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
-msgstr[0] "Se removerá el siguiente objeto"
+msgstr[0] "Se removerá el siguiente objeto:"
 msgstr[1] "Se removerán los siguientes objetos:"
 
 #: builtin/clean.c:848
@@ -6685,12 +6940,12 @@ msgstr "limpieza interactiva"
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
-msgstr "patron"
+msgstr "patrón"
 
 #: builtin/clean.c:917
 msgid "add <pattern> to ignore rules"
@@ -6698,7 +6953,7 @@ msgstr "agregar <patrón> para ignorar reglas"
 
 #: builtin/clean.c:918
 msgid "remove ignored files, too"
-msgstr "borrar archivos ignorados, tambien"
+msgstr "borrar archivos ignorados, también"
 
 #: builtin/clean.c:920
 msgid "remove only ignored files"
@@ -6724,144 +6979,144 @@ msgstr ""
 "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
-msgstr "crear un repositorio vacio"
+msgstr "crear un repositorio vacío"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "crear un repositorio espejo (implica vacío)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "clonar de un repositorio local"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "no usar hardlinks, siempre copiar"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "pathspec"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
-msgstr "inicializar submodulos en el clonado"
+msgstr "inicializar submódulos en el clonado"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
-msgstr "numero de submodulos clonados en paralelo"
+msgstr "numero de submódulos clonados en paralelo"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "directorio-template"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "directorio del cual los templates serán usados"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "repositorio de referencia"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "usa--reference  solamente si estas clonado"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nombre"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checkout <rama> en lugar de HEAD remota"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "ruta para git-upload-pack en el remoto"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "profundidad"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "crear un clon superficial para esa profundidad"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "tiempo"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "crear un clon superficial desde el tiempo específico"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ahondando historia de clon superficial, excluyendo rev"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clonar solo una rama,HEAD o --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "no clonar niun tag, y hacer que los subsiguientes fetch no los sigan"
+msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "cualquier submódulo clonado será superficial"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "separa git dir del árbol de trabajo"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "llave=valor"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "configurar config dentro del nuevo repositorio"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6869,42 +7124,42 @@ msgstr ""
 "No se pudo adivinar ningún nombre de directorio.\n"
 "Por favor especifique un directorio en la línea de comando"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "fallo al abrir '%s'"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "falló al analizar %s\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "fallo al crear link '%s'"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "fallo al copiar archivo a '%s'"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6914,100 +7169,100 @@ msgstr ""
 "Puede inspeccionar a qué se hizo checkout con 'git status'\n"
 "y volver a intentarlo con 'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
-msgstr "No se pudo encontrar la rama remota %s para clonar"
+msgstr "No se pudo encontrar la rama remota %s para clonar."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
-msgstr "remoto no mando todos los objetos necsarios"
+msgstr "remoto no mando todos los objetos necesarios"
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
-"HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n"
+"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el árbol de trabajo"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "no es posible escribir parámetros al archivo config"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "no se puede desvincular archivos alternos temporales"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
-msgstr "Tienes que especificar un repositorio para clonar"
+msgstr "Tienes que especificar un repositorio para clonar."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Las opciones --bare y --origin %s son incompatibles."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare y --separate-git-dir son incompatibles."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "profundidad %s no es un numero positivo"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "la ruta de destino '%s' ya existe y no es un directorio vacio"
+msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no se pudo crear directorios principales de '%s'"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un árbol de trabajo '%s'"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
-msgstr "Clonando en un repositorio vacio '%s'...\n"
+msgstr "Clonando en un repositorio vacío '%s'...\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -7015,32 +7270,36 @@ msgstr ""
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since es ignorado en el clon local; use file:// ."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude es ignorado en clones locales; use file://."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Rama remota %s no encontrada en upstream %s"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 
@@ -7050,7 +7309,7 @@ msgstr "git column [<opciones>]"
 
 #: builtin/column.c:27
 msgid "lookup config vars"
-msgstr "revisa las variables de configuraciones "
+msgstr "revisa las variables de configuraciones"
 
 #: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
@@ -7058,7 +7317,7 @@ msgstr "capa a usar"
 
 #: builtin/column.c:30
 msgid "Maximum width"
-msgstr "Ancho maximo"
+msgstr "Ancho máximo"
 
 #: builtin/column.c:31
 msgid "Padding space on left border"
@@ -7076,76 +7335,25 @@ msgstr "Realizando padding entre columnas"
 msgid "--command must be the first argument"
 msgstr "--command debe ser el primer argumento"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tu nombre y correo fueron configurados automáticamente basados\n"
-"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
-"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta "
-"el \n"
-"siguiente comando y sigue las instrucciones de tu editor\n"
-" para modificar tu archivo de configuración:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tu nombre y correo fueron configurados automáticamente basados\n"
-"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
-"Tu puedes suprimir este mensaje configurándolos de forma explicita: \n"
-"\n"
-"    git config --global user.name \"Tu nombre\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 "Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n"
-"vaciaria. Puedes repetir el commando con --alow-empty, o puedes remover \n"
+"vaciaría. Puedes repetir el comando con --alow-empty, o puedes remover \n"
 "el commit completamente con \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7160,11 +7368,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Caso contrario, por favor usa 'git reset'\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7180,61 +7388,61 @@ msgstr ""
 "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
 "para los commits restantes.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "fallo al desempaquetar objeto del árbol HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "no es posible crear un índice temporal"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el índice temporal"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "Fallo al actualizar el cache principal del árbol"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
-msgstr "no es posible escribir archiv new_index"
+msgstr "no es posible escribir archivo new_index"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "no se puede realizar un commit parcial durante una fusión."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no se puede realizar un commit parcial durante un cherry-pick."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
-msgstr "no se puede leer el índice."
+msgstr "no se puede leer el índice"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
-msgstr "no es posible escribir el índice temporal "
+msgstr "no es posible escribir el índice temporal"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
-msgstr "falta header de autor al commit '%s'"
+msgstr "commit '%s' requiere cabecera de autor"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "el commit '%s' tiene una línea de autor mal formada"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
-msgstr "malformado - parámetro de autor"
+msgstr "parámetro --author mal formado"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7242,38 +7450,38 @@ msgstr ""
 "no es posible seleccionar un carácter de comentario que no es usado\n"
 "en el mensaje de commit actual"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no se pudo revisar el commit %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(leyendo mensajes de logs desde standard input)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7288,7 +7496,7 @@ msgstr ""
 "\t%s\n"
 "y vuelve a intentar.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7303,7 +7511,7 @@ msgstr ""
 "\t%s\n"
 "y vuelva a intentar.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7313,7 +7521,7 @@ msgstr ""
 "comiencen\n"
 "con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7325,146 +7533,150 @@ msgstr ""
 "con '%c' serán guardadas; puede removerlas usted mismo si desea.\n"
 "Un mensaje vacío aborta el commit.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "No se puede leer el índice"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
 "autor existente"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo ignorado inválido '%s'"
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo inválido de los archivos no rastreados '%s'"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "--long y -z son incompatibles"
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author y --author no tiene sentido"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Estás en medio de una fusión -- no puedes enmendar."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo."
+msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "La opción -m no puede ser combinada con -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "La opción -m no puede ser combinada con -c/-C/-F."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "No hay rutas con --include/--only no tiene sentido."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup invalido %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "Rutas con -a no tiene sentido."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "mostrar información de la rama"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "mostrar información del stash"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "calcular todos los valores delante/atrás"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "output formato-maquina"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
 "(Predeterminado: all)"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -7472,223 +7684,199 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "cuando"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
-"ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. "
+"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinación de argumentos de archivos ignorados y no rastreados no soportada"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "no se pudo revisar el commit recién creado"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "no se pudo analizar el commit recién creado"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "No se pudo resolver HEAD tras crear el commit"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "HEAD desacoplado"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr "(commit-raiz)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "sobrescribe el autor del commit"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "fecha"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "mensaje"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "mensaje del commit"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "confirmar"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit especifico"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "reusar el mensaje de un commit especifico"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensaje de formato autosquash para arreglar el commit especificado"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usar el mensaje de formato autosquash para realizar squash  al commit "
 "especificado"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "default"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
-msgstr "firmar commit con GPG"
+msgstr "Firmar commit con GPG"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "sólo confirmar archivos específicos"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
-msgstr "mostrar lo que sería incluído en el commit"
+msgstr "mostrar lo que sería incluido en el commit"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "gancho bypass post reescritura"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
-msgstr "ok al grabar un cambio vacio"
+msgstr "ok al grabar un cambio vacío"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
-msgstr "ok al grabar un cambio con un mensaje vacio"
-
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "no se pudo analizar el commit de HEAD"
+msgstr "ok al grabar un cambio con un mensaje vacío"
 
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abortando commit debido que el mensaje está en blanco.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abortando commit; no se ha editado el mensaje\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7704,7 +7892,7 @@ msgstr "git config [<opciones>]"
 
 #: builtin/config.c:58
 msgid "Config file location"
-msgstr "ubicación del archivo config"
+msgstr "Ubicación del archivo configuración"
 
 #: builtin/config.c:59
 msgid "use global config file"
@@ -7757,7 +7945,7 @@ msgstr ""
 
 #: builtin/config.c:70
 msgid "add a new variable: name value"
-msgstr "agregar nueva variable: nombre valor "
+msgstr "agregar nueva variable: nombre valor"
 
 #: builtin/config.c:71
 msgid "remove a variable: name [value-regex]"
@@ -7821,7 +8009,7 @@ msgstr "Otro"
 
 #: builtin/config.c:86
 msgid "terminate values with NUL byte"
-msgstr "Terminar valores con un byte NUL"
+msgstr "terminar valores con un byte NULL"
 
 #: builtin/config.c:87
 msgid "show variable names only"
@@ -7829,7 +8017,7 @@ msgstr "mostrar solo nombres de variables"
 
 #: builtin/config.c:88
 msgid "respect include directives on lookup"
-msgstr "respetar directivas include en la busqueda"
+msgstr "respetar directivas include en la búsqueda"
 
 #: builtin/config.c:89
 msgid "show origin of config (file, standard input, blob, command line)"
@@ -7837,7 +8025,7 @@ msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
 
 #: builtin/config.c:335
 msgid "unable to parse default color value"
-msgstr "no es posible analizar el valor default de color "
+msgstr "no es posible analizar el valor por defecto de color"
 
 #: builtin/config.c:479
 #, c-format
@@ -7908,29 +8096,29 @@ msgstr "tag anotado %s no disponible"
 #: builtin/describe.c:271
 #, c-format
 msgid "annotated tag %s has no embedded name"
-msgstr "tag anotado %s no tiene nombre embebido "
+msgstr "tag anotado %s no tiene nombre embebido"
 
 #: builtin/describe.c:273
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "tag '%s' es realmente '%s' aquí"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "no hay tag que concuerde exactamente con '%s'"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "búsqueda finalizada a las %s\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7939,7 +8127,7 @@ msgstr ""
 "No hay tags anotados que puedan describir '%s'.\n"
 "Sin embargo, hubieron tags no anotados: intente --tags."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7948,12 +8136,12 @@ msgstr ""
 "Ningún tag puede describit '%s'.\n"
 "Intente --always, o cree algunos tags."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits cruzados\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7962,90 +8150,90 @@ msgstr ""
 "se encontró más de %i tags; se mostró %i más reciente\n"
 "fin de la búsqueda en %s\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Nombre de objeto %s no válido"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no es un commit ni un blob"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "encontrar el tag que viene después del commit"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "hacer debug a la estrategia de búsqueda en stderr"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "use cualquier ref"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "use cualquier tag, incluso los no anotados"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "siempre usar formato largo"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "solo seguir el primer patrón"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considerar <n> tags más recientes (default:10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "solo considerar tags que concuerden con <patrón>"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "no considerar tags que concuerden con <patrón>"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar el objeto commit abreviado como fallback"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")"
+msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long es incompatible con --abbrev=0"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "No se encontraron nombres, no se puede describir nada."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty es incompatible con commit-ismos"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken es incompatible con commit-ismos"
 
@@ -8066,7 +8254,7 @@ msgstr "No es un repositorio git"
 #: builtin/diff.c:399
 #, c-format
 msgid "invalid object '%s' given."
-msgstr "objeto '%s' entregado no es válido"
+msgstr "objeto '%s' entregado no es válido."
 
 #: builtin/diff.c:408
 #, c-format
@@ -8233,95 +8421,101 @@ msgstr "Aplicar refspec para los refs exportados"
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "extraer de todos los remotos"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "ruta para cargar el paquete al final del remoto"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "forzar sobrescritura de la rama local"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "extraer de múltiples remotos"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "extraer todos los tags y objetos asociados"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no extraer todos los tags (--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos extraídos en paralelo"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
-msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto"
+msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
+
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"limpiar tags locales que no se encuentran en el remoto y eliminar tags "
+"cambiados"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "en demanda"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "controlar extracción recursiva de submódulos"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "permitir actualizar la ref HEAD"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "historia profunda de un clon superficial"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "historia profunda de un repositorio superficial basado en tiempo"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "dir"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
-msgstr "anteponer esto a salida de la ruta del submódulo "
+msgstr "anteponer esto a salida de la ruta del submódulo"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8329,89 +8523,89 @@ msgstr ""
 "default para extracción recursiva de submódulos (menor prioridad que "
 "archivos de configuración)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "aceptar refs que actualicen .git/shallow"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "No se puedo encontrar ref remota HEAD"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuración fetch.output contiene el valor inválido %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[actualizado]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[rechazado]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "no se posible actualizar el ref local"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[nueva rama]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "actualización forzada"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "avance lento"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no envió todos los objetos necesarios\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8420,50 +8614,56 @@ msgstr ""
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para remover cualquier rama vieja o conflictiva"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s se pondrá colgado)"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s se ha colgado)"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(nada)"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opción \"%s\" es ignorada por %s\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No se pudo extraer %s"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"--filter solo puede ser usado con el remoto configurado en core.partialClone"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8471,40 +8671,40 @@ msgstr ""
 "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
 "nombre remoto del cual las nuevas revisiones deben ser extraídas."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Tiene que especificar un nombre de tag."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
-msgstr "--depen y --depth son mutuamente exclusivas"
+msgstr "--deepen y --depth son mutuamente exclusivas"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth y --unshallow no pueden ser usadas juntas"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow no tiene sentido en un repositorio completo"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
 
@@ -8552,25 +8752,25 @@ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 
 #: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
-msgstr "Cite los marcadores de posición adecuadamente para los shells"
+msgstr "cite los marcadores de posición adecuadamente para los shells"
 
 #: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
-msgstr "Cite los marcadores de posición adecuadamente para perl"
+msgstr "cite los marcadores de posición adecuadamente para perl"
 
 #: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
-msgstr "Cite los marcadores de posición adecuadamente para python"
+msgstr "cite los marcadores de posición adecuadamente para python"
 
 #: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
-msgstr "Cite los marcadores de posición adecuadamente para Tcl"
+msgstr "cite los marcadores de posición adecuadamente para Tcl"
 
 #: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "mostrar solo <n> refs encontradas"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "respetar el formato de colores"
 
@@ -8594,63 +8794,63 @@ msgstr "mostrar solo refs que contienen el commit"
 msgid "print only refs which don't contain the commit"
 msgstr "mostrar solo refs que no contienen el commit"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "reportar tags"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "hacer objetos índices cabezas de nodos"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "también considerar paquetes y objetos alternos"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
-msgstr "revisar solo connectividad"
+msgstr "revisar solo conectividad"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "habilitar revisión más estricta"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "escribir objetos colgados en .git/lost-found"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
-msgstr "mostrar prograso"
+msgstr "mostrar progreso"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "mostrar nombres verboso para objetos alcanzables"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "Revisando objetos"
 
@@ -8695,33 +8895,33 @@ msgstr "ser más exhaustivo (aumentar runtime)"
 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Falló al analizar valor %s de gc.logexpirity"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Auto empaquetado del repositorio en segundo plano para un performance "
 "óptimo.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vea \"git help gc\" para limpieza manual.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8729,7 +8929,7 @@ msgstr ""
 "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
 "es así)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8740,12 +8940,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"
@@ -8754,249 +8954,249 @@ msgstr "número inválido de hilos especificado (%d) para %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no es posible leer el  árbol (%s)"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numérico"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "buscar en el índice en lugar del árbol de trabajo"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "encontrar en contenidos no manejados por git"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar archivos especificados via '.gitignore'"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "búsqueda recursiva en cada submódulo"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "mostrar líneas que no concuerdan"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "búsqueda insensible a mayúsculas"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "concordar patrón solo a los límites de las palabras"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
-msgstr "procesar archivos binarios con filtros textconv "
+msgstr "procesar archivos binarios con filtros textconv"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "descender como máximo <valor-de-profundiad>  niveles"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar patrones como strings arreglados"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "mostrar números de línea"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo para --files-with-matches"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "mostrar solo los nombres de archivos sin coincidencias"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "imprimir NUL después del nombre de archivo"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
-msgstr "Mostrar el número de concordancias en lugar de las líneas concordantes"
+msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostrar el nombre de archivo solo una vez para concordancias en el mismo "
 "archivo"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> líneas de contexto antes de las concordancias"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> líneas de context después de las concordancias"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr ""
 "mostrar una línea con el nombre de la función antes de las concordancias"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "mostrar la función circundante"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostrar solo concordancias con archivos que concuerdan todos los patrones"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "mostrar árbol analizado para la expresión grep"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
-msgstr "no se ha entregado patrón"
+msgstr "no se ha entregado patrón."
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no se puede usar con revs"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no se posible resolver revisión: %s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "número inválido de hilos especificado (%d)"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "no se soportan hilos, ignorando --threads"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "opción no soportada con --recurse-submodules."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached o --untracked no pueden ser usadas con --no-index."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "--cached y árboles han sido entregados."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -9004,38 +9204,38 @@ msgstr ""
 "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
 "[--] <archivo>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "tipo"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "tipo de objeto"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "escribir el objeto en la base de datos de objetos"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "leer el objeto de stdin"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "guardar el archivo como es sin filtros"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "solo realizar un hash a cualquier basura random para crear un objeto "
 "corrupto para hacer debugging de Gti"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 
@@ -9111,15 +9311,15 @@ msgstr ""
 #: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
-msgstr "'%s': visualizador de man desconocido"
+msgstr "'%s': visualizador de man desconocido."
 
 #: builtin/help.c:357
 msgid "no man viewer handled the request"
-msgstr "ningun visualizador de manual proceso la petición"
+msgstr "ningún visualizador de manual proceso la petición"
 
 #: builtin/help.c:365
 msgid "no info viewer handled the request"
-msgstr "ningún vizor de info manejo la peticion"
+msgstr "ningún visor de info manejo la petición"
 
 #: builtin/help.c:407
 msgid "Defining attributes per path"
@@ -9127,7 +9327,7 @@ msgstr "Definiendo atributos por ruta"
 
 #: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
-msgstr "Git diario con 20 comandos o algo asi"
+msgstr "Git diario con 20 comandos o algo así"
 
 #: builtin/help.c:409
 msgid "A Git glossary"
@@ -9139,7 +9339,7 @@ msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
 
 #: builtin/help.c:411
 msgid "Defining submodule properties"
-msgstr "Definiendo las propiedades del submodulo"
+msgstr "Definiendo las propiedades del submódulo"
 
 #: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
@@ -9167,152 +9367,152 @@ msgstr "'%s' tiene el alias '%s'"
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "no es posible abrir %s"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "el tipo del objeto no concuerda en %s"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no se recibió el objeto esperado %s"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, encontrado %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no se puede llenar %d byte"
 msgstr[1] "no se pueden llenar %d bytes"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "EOF temprano"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "leer error en input"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "se usaron más bytes de los disponibles"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "paquete muy grande para la definición actual de off_t"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "no se puede crear '%s'"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "no se puede abrir el archivo de paquete '%s'"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "firma del paquete no concuerda"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versión de paquete %<PRIu32> no soportada"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate retornó %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "valor de offset desbordado para el objeto base delta"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "offset de base delta está fuera de límites"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo de objeto %d desconocido"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "no se puede propagar el paquete"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
 msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "no se posible leer %s"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no se puede leer la información existente del objeto %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no se puede leer el objeto existente %s"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "%s inválido"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Error en el objeto"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No todos los objetos hijos de %s son alcanzables"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 
@@ -9363,7 +9563,7 @@ msgstr[1] "completado con %d objetos locales"
 #: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "tail checksum para %s inesperada (corrupción de disco?)"
+msgstr "Tail checksum para %s inesperada (corrupción de disco?)"
 
 #: builtin/index-pack.c:1283
 #, c-format
@@ -9382,77 +9582,81 @@ msgstr "no es posible desinflar el objeto adjunto (%d)"
 msgid "local object %s is corrupt"
 msgstr "objeto local %s está corrompido"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "error mientras se cierra el archivo paquete"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "no se puede escribir el archivo  guardado '%s'"
+msgid "cannot write %s file '%s'"
+msgstr "no se puede escribir %s en el archivo '%s'"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "no se puede cerrar el archivo guardado escrito '%s'"
+msgid "cannot close written %s file '%s'"
+msgstr "no se puede cerrar escrito %s en archivo '%s'"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "error mientras se cierra el archivo paquete"
+
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "no se puede guardar el archivo paquete"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "no se puede guardar el archivo índice"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No se puede abrir el archivo paquete existente '%s'"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No se puede abrir el índice del archivo paquete para '%s'"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "no delta: %d objeto"
 msgstr[1] "no delta: %d objetos"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "largo de cadena = %d: %lu objeto"
 msgstr[1] "largo de cadena = %d: %lu objetos"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "No se puede regresar a cwd"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "mal %s"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no puede ser usada sin --stdin"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "--verify no recibió ningún nombre de archivo de paquete"
 
@@ -9637,120 +9841,120 @@ msgstr "--trailer con --only-input no tiene sentido"
 msgid "no input file given for in-place editing"
 msgstr "no se entregó archivo de entrada para edición en lugar"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opción --decorate inválida: %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "mostrar fuente"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
-msgstr "usar archivo de mapa de mail"
+msgstr "Usar archivo de mapa de mail"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "solo decorar refs que concuerden con <patrón>"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decorar refs que concuerden con <patrón>"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "opciones de decorado"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "No se pudo leer objeto %s"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipo desconocido: %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "formate.headers. sin valor"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "nombre del directorio de salida es muy largo"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "No se puede abrir archivo patch %s"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Exactamente un rango necesario."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "No es un rango."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "Letras de portada necesita formato email"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
-msgstr "dos directorios de salida?"
+msgstr "Dos directorios de salida?"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Falló al resolver '%s' como una ref válida."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "No se pudo encontrar una base de fusión."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9762,230 +9966,230 @@ msgstr ""
 "O puede especificar un commit base mediante --base=<id-commit-base> "
 "manualmente."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "Fallo al encontrar una base de fusión exacta"
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "el commit base debe ser el ancestro de la lista de revisión"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "el commit base no debe estar en la lista de revisión"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "use [PATCH n/m] incluso con un único parche"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "use [PATCH] incluso con múltiples parches"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "generar letra de cover"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr ""
 "usar una secuencia simple de números para salida de nombres de archivos"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "use <sfx> en lugar de '.patch'"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Use [RFC PATCH] en lugar de [PATCH]"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Use [<prefijo>] en lugar de [PATCH]"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
-msgstr "salida como hash de todos-ceros en la cabecera From "
+msgstr "salida como hash de todos-ceros en la cabecera From"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "no incluya un parche que coincida con un commit en upstream"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "mostrar formato de parche en lugar del default (parche + stat)"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "Mensajeando"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "cabezal"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "agregar cabecera email"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "configurar dirección From a <ident> ( o identidad de committer si está "
 "ausente)"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "id de mensaje"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "hacer primer mail una respuesta a <id de mensaje>"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "límite"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "poner el parche en línea"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "agregar una firma"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "commit-base"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "agregar información de árbol de requisitos previos a la serie de parches"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línea de identificación inválida: %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "-n y -k son mutuamente exclusivas."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
-msgstr "salida standard, o directorio, cual? "
+msgstr "salida standard, o directorio, cual?"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "No se pudo crear el directorio '%s'"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no se puede leer la firma del archivo '%s'"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "Generando parches"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "Falló al crear los archivos de salida"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10077,7 +10281,7 @@ msgstr "agregar las exclusiones standard de git"
 
 #: builtin/ls-files.c:560
 msgid "make the output relative to the project top directory"
-msgstr "hacer la salidad relativa al directorio principal del proyecto"
+msgstr "hacer la salida relativa al directorio principal del proyecto"
 
 #: builtin/ls-files.c:563
 msgid "recurse through submodules"
@@ -10143,7 +10347,7 @@ msgstr "tomar url.<base>.insteadOf en cuenta"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
 
@@ -10189,184 +10393,184 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "cambiar `m' requiere un valor"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostrar un diffstat al final de la fusión"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "mostrar un diffstat al final de la fusión"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
 "fusión"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "crear un commit único en lugar de hacer una fusión"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realizar un commit si la fusión es exitosa (default)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "abortar si fast-forward no es posible"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verificar que el commit nombrado tiene una firma GPG válida"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "estrategia"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "estrategia de fusión para usar"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "opción=valor"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "opción para la estrategia de fusión seleccionada"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "abortar la fusión en progreso actual"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "continuar la fusión en progreso actual"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "verificar el hook commit-msg"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "stash falló"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto válido: %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit de squash -- no actualizando HEAD\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
-msgstr "'%s' no apunta a ningun commit"
+msgstr "'%s' no apunta a ningún commit"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opción desconocida para merge-recursive: -X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No se puedo leer de '%s'"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "No se realiza commit de la fusión; use 'git commit' para completar la "
 "fusión.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10383,70 +10587,70 @@ msgstr ""
 "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
 "el commit.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Fusión automática falló; arregle los conflictos y luego realice un commit "
 "con el resultado.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "No rama actual."
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "Por defecto, no hay un upstream  definido para la rama actual."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hay rama de rastreo remoto para %s de %s"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mal valor '%s' en el entorno '%s'"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10454,7 +10658,7 @@ msgstr ""
 "No ha concluido la fusión (existe MERGE_HEAD).\n"
 "Por favor, realice un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10462,113 +10666,113 @@ msgstr ""
 "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
 "Por favor, realice un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No se puede combinar --squash con --no-ff."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hay commit especificado y merge.defaultToUpstream no está configurado."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s no tiene una firma GPG."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "El Commit %s tiene una buena firma GPG por %s\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "Ya está actualizado."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Intentando fusión en índice realmente trivial...\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "Ya está actualizado. ¡Oh, yeaahh!"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "No es posible hacer fast-forward, abortando."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rebobinando el árbol a original...\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusión %s...\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s falló.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Usando el %s para preparar resolución a mano.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10600,7 +10804,7 @@ msgstr "mostrar todos los ancestros comunes"
 
 #: builtin/merge-base.c:222
 msgid "find ancestors for a single n-way merge"
-msgstr "encontrar ancestros para una única fusión de n-vías "
+msgstr "encontrar ancestros para una única fusión de n-vías"
 
 #: builtin/merge-base.c:224
 msgid "list revs not reachable from others"
@@ -10628,7 +10832,7 @@ msgstr "mandar resultados a standard output"
 
 #: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
-msgstr "usar un fusión basada en diff3 "
+msgstr "usar un fusión basada en diff3"
 
 #: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
@@ -10725,75 +10929,75 @@ msgstr "%.*s está en el índice"
 msgid "force move/rename even if target exists"
 msgstr "forzar mover/renombrar incluso si el objetivo existe"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destino '%s' no es un directorio"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "mala fuente"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "no se pude mover un directorio en sí mismo"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "no se puede mover un directorio dentro de un archivo"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "directorio de fuente está vacío"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
-msgstr "no se encuentra bajo control de versión "
+msgstr "no se encuentra bajo control de versión"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "destino existe"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "sobrescribiendo '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "No se puede sobrescribir"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "múltiples fuentes para el mismo objetivo"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, fuente=%s, destino=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
-msgstr "fallo al renombrar '%s'"
+msgstr "renombrando '%s' falló"
 
 #: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
@@ -10984,12 +11188,12 @@ msgstr "incapaz de escribir el objeto de nota"
 msgid "the note contents have been left in %s"
 msgstr "los contenidos de nota han sido dejados en %s"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no se puede leer '%s'"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no se pudo abrir o leer '%s'"
@@ -11235,7 +11439,7 @@ msgstr "intentar remover una nota no existente no es un error"
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "no remover, solo mostrar"
 
@@ -11270,188 +11474,192 @@ msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error al desinflar (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "deshabilitando escritura bitmap, paquetes son divididos debido a pack."
 "packSizeLimit"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
 "empaquetados"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "valor inválido para --missing"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versión de índice no soportada %s"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versión del índice '%s'"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "no mostrar medidor de progreso"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "mostrar medidor de progreso"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "versión[,offset]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escribir el índice de paquete en la versión de formato idx especificado"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "tamaño máximo de cada paquete resultante"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos prestados de otros almacenes de objetos"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "ignorar objetos paquete"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr "usar hilos cuando se busque para mejores concordancias de delta"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacío"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "leer argumentos de revisión de standard input"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el índice"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "nivel de compresión del paquete"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "escribir un índice de bitmap junto al índice de paquete"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "no se puede empaquetar objetos en packfiles promisores"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "Contando objetos"
 
@@ -11479,15 +11687,19 @@ msgstr "Removiendo objetos duplicados"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "expirar objetos más viejos a <tiempo>"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos-preciosos"
 
@@ -11532,7 +11744,7 @@ msgstr "número de submódulos que realizan pull en paralelo"
 #: builtin/pull.c:299
 #, c-format
 msgid "Invalid value for pull.ff: %s"
-msgstr "valor inválido para pull.ff: %s"
+msgstr "Valor inválido para pull.ff: %s"
 
 #: builtin/pull.c:415
 msgid ""
@@ -11587,7 +11799,7 @@ msgstr "Ver git-pull(1) para detalles."
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<rama>"
@@ -11612,27 +11824,27 @@ msgstr ""
 "Tu configuración especifica fusionar con la ref '%s'\n"
 "de tu remoto, pero no se pudo hacer fetch a esa ref."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "La opción --[no-]autostash sólo es válida con --rebase."
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Actualizando una rama no nata con cambios agregados al índice."
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11643,7 +11855,7 @@ msgstr ""
 "realizando fast-forward al árbol de trabajo\n"
 "desde commit %s."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11660,15 +11872,15 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No se puede fusionar múltiples ramas en un head vacío."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en múltiples ramas."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -11945,7 +12157,7 @@ msgstr "realizar push de tags faltantes pero relevantes"
 
 #: builtin/push.c:563 builtin/send-pack.c:168
 msgid "GPG sign the push"
-msgstr "firmar con GPG el push"
+msgstr "Firmar con GPG el push"
 
 #: builtin/push.c:565 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
@@ -12054,39 +12266,43 @@ msgstr "git rebase--helper [<opciones>]"
 msgid "keep empty commits"
 msgstr "mantener commits vacíos"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "permitir commits con mensajes vacíos"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "continuar rebase"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "abortar rebase"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "generar script de rebase"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "ids de commits cortos en la lista de pendientes"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "expandir ids de commits en la lista de pendientes"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "saltar los picks innecesarios"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "reorganizar líneas fixup/squash"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 
@@ -12094,7 +12310,7 @@ msgstr "insertar comando exec en la lista de pendientes"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12127,7 +12343,7 @@ msgstr ""
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configure 'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12148,15 +12364,15 @@ msgstr ""
 "\n"
 "Para suprimir este mensaje, puede configurarlo en 'refuse'."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "tranquilo"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Se tiene que especificar un directorio."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo válida"
@@ -12682,89 +12898,89 @@ msgstr ""
 "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
 "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "lo mismo que -a, y pierde objetos inaccesibles"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "remover paquetes redundantes, y ejecutar git-prune-packed"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "pasar --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "aproxime"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, no perder objetos más antiguos que este"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
-msgstr "con -a, re empaquetar objetos inalcanzables "
+msgstr "con -a, re empaquetar objetos inalcanzables"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "tamaño de la ventana usado para la compresión delta"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "bytes"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
 "entradas"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad máxima del delta"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "limita el número máximo de hilos"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "tamaño máximo de cada paquete"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "re-empaquetar objetos en paquetes marcados con .keep"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable y -A son incompatibles"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "falló al remover '%s'"
@@ -12829,7 +13045,7 @@ msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 
 #: builtin/replace.c:438
 msgid "list replace refs"
-msgstr "listar replace refs "
+msgstr "listar replace refs"
 
 #: builtin/replace.c:439
 msgid "delete replace refs"
@@ -12847,11 +13063,11 @@ msgstr "cambiar un padre de commit"
 msgid "replace the ref if it exists"
 msgstr "reemplazar el ref si este existe"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "no se puede imprimir contenidos para --edit"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "usar este formato"
 
@@ -12899,112 +13115,116 @@ msgstr "mantener"
 
 #: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
-msgstr "No hay un HEAD válido"
+msgstr "No hay un HEAD válido."
 
 #: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
-msgstr "Falló al encontrar el HEAD del árbol"
+msgstr "Falló al encontrar el HEAD del árbol."
 
 #: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falló al encontrar árbol de %s."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está ahora en %s"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
-msgstr "no se puede realziar un reset %s  en medio de una fusión."
+msgstr "No se puede realziar un reset %s  en medio de una fusión."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "ser silencioso, solo reportar errores"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "reiniciar HEAD e index"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "reiniciar HEAD, índice y árbol de trabajo"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "grabar solo el hecho de que las rutas removidas serán agregadas después"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Falló al resolver '%s' como una revisión válida."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Falló al resolver '%s' como un árbol válido."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch es incompatible con --{hard,mixed,soft}"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No se puede hacer un reset %s con rutas."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset no está permitido en un repositorio vacío"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N sólo puede ser usada con --mixed"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del área de stage tras el reset:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No se puede reiniciar el índice a la revisión '%s'."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "no se puede combinar --exclude-promisor-objects y --missing"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "filtrado de objetos requiere --objects"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "valor disperso inválido: '%s'"
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list no soporta mostrar notas"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
 
@@ -13108,10 +13328,6 @@ msgstr "adjuntar el nombre del commit"
 msgid "preserve initially empty commits"
 msgstr "preservar commits iniciales vacíos"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "permitir commits con mensajes vacíos"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "mantener commits redundantes, vacíos"
@@ -13136,7 +13352,7 @@ msgid_plural ""
 "the following files have staged content different from both the\n"
 "file and the HEAD:"
 msgstr[0] ""
-"El siguiente archivo tiene contenido en stage diferente al archivo\n"
+"el siguiente archivo tiene contenido en stage diferente al archivo\n"
 "y a HEAD:"
 msgstr[1] ""
 "los siguientes archivos tienen contenido diferente a los mismos\n"
@@ -13457,35 +13673,39 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "anteponer carácter de comentario y espacio a cada línea"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "No existe ref: %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "subomdule--helper print-default-remote no toma argumentos"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no se puede quitar un componente del url '%s'"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "ancho alternativo para rutas relativas"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13494,57 +13714,57 @@ msgstr ""
 "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
 "su propio upstream autoritativo."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Error al registrar el modo de actualización para la ruta del submódulo '%s'"
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
-msgstr "suprime la salida para inicializar un submódulo"
+msgstr "Suprime la salida para inicializar un submódulo"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<ruta>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
-"No se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
+"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr "No pudo resolver ref de HEAD dentro del submódulo '%s'"
+msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "falló al recursar en el submódulo '%s'"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
-msgstr "Suprimir output del estado del submódulo "
+msgstr "Suprimir output del estado del submódulo"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -13552,54 +13772,143 @@ msgstr ""
 "Usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "recursar en submódulos anidados"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Sincronizando url del submódulo para '%s'\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "falló al registrar el url para la ruta del submódulo '%s'"
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "error al actualizar el remoto para el submódulo '%s'"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Suprime la salida del url del submódulo que se sincroniza"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Recursar en submódulos anidados"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
+"rf' si realmente quiere removerlo incluyendo todo en su historia)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
+"'-f' para descartarlas"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Directorio '%s' limpiado\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "no se pudo crear directorio vacío de submódulo %s"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+"Remover arboles de trabajo de submódulos incluso si contienen cambios locales"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "Quitar todos los submódulos"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submódulo '%s' no puede agregar alterno: %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submódulo será clonado"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "nombre del nuevo submódulo"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "url de dónde clonar el submódulo"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13608,83 +13917,83 @@ msgstr ""
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "no se pudo obtener el directorio de submódulo para '%s'"
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submódulo '%s' no inicializada"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Tal vez quiere usar 'update --init'?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submódulo %s no fusionado"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submódulo '%s'"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Falló al clonar '%s'. Reintento programado"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Falló al clonar '%s' una segunda vez, abortando"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "ruta hacia el árbol de trabajo"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clon superficial truncado al número especificado de revisión"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "si el clon inicial debe seguir la recomendación superficial"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "no mostrar el progreso de clonado"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "mal valor para parámetro update"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13693,20 +14002,20 @@ msgstr ""
 "Rama de submódulo (%s)  configurada para heredar rama del superproyecto, "
 "pero el superproyecto no está en ninguna rama"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<ruta>...]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no soporta --super-prefix"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper valido"
@@ -13811,139 +14120,143 @@ msgstr "incapaz de firmar tag"
 msgid "unable to write tag file"
 msgstr "incapaz de escribir el archivo de tag"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "¿Sin mensaje de tag?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "El mensaje del tag ha sido dejado en %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "listar nombres de tags"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> líneas de cada mensaje de tag"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "eliminar tags"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "verificar tags"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Opciones de creación de tags"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "tags anotadas necesitan un mensaje"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "mensaje de tag"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "forzar la edición del mensaje de tag"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotado y firmado con GPG"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "usar otra clave para firmar el tag"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "remplazar tag si existe"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "crear un reflog"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "mostrar lista de tags en columnas"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "mostrar solo tags que contienen el commit"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "mostrar solo tags que no contienen el commit"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "sólo imprimir las tags que están fusionadas"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "sólo imprimir las tags que no están fusionadas"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "sólo imprimir tags de el objeto"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column y -n son incompatibles"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "opción -n solo es permitida en modo lista"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "opción --contains solo es permitido en modo lista"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "opción --no-contains solo es permitida en modo lista"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "opción --points-at solo es permitida en modo lista"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "opciones --merged y --no-merged  solo están permitidas en modo lista"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "sólo se permite una de las opciones, -m ó -F."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "demasiados parámetros"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' no es un nombre de tag válido."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "el tag '%s' ya existe"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 
@@ -14281,8 +14594,8 @@ msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<opciones>] <ruta> [<rama>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14293,29 +14606,37 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <worktree> <nueva-ruta>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opciones>] <worktree>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Removiendo el worktrees/%s: no es un directorio válido"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -14324,107 +14645,187 @@ msgstr ""
 "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
 "bytes, %<PRIuMAX> leídos)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "reporta árboles de trabajo recortados"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "expirar árboles de trabajo más viejos a <tiempo>"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Preparando %s (identificador %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
 "trabajo"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "popular el nuevo árbol de trabajo"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo árbol de trabajo bloqueado"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, y --detach son mutuamente exclusivas"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "razón para bloquear"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' no es un árbol de trabajo"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya está bloqueado; razón: %s"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya está bloqueado"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"árboles de trabajo conteniendo submódulos no puede ser movidos o removidos"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' es un árbol de trabajo principal"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "no se pudo descubrir el nombre de destino de '%s'"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "el objetivo '%s' ya existe"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr ""
+"no se puede mover un árbol de trabajo encerrado, motivo del encierro: %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "no se puede mover un árbol de trabajo encerrado"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "fallo al mover '%s' a '%s'"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "falló al ejecutar 'git status' en '%s'"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s' está sucio, use --force para borrarlo"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "fallo al borrar '%s'"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "forzar remoción incluso si el árbol de trabajo está sucio"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr ""
+"no se pueden remover árbol de trabajo encerrado, razón del encierro: %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "no se puede remover árbol de trabajo encerrado"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "falló validación, no se puede remover árbol de trabajo: %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
@@ -14441,23 +14842,23 @@ msgstr "escribir objeto de  árbol para un subdirectorio <prefijo>"
 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opciones>] <directorio>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "sale después de un intercambio petición/respuesta único"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "salir inmediatamente tras el anuncio inicial de ref"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrumpir transferencia tras <n> segundos de inactividad"
 
@@ -14479,6 +14880,20 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "mostrar mensajes de debug en stderr"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
+"           [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
+"           <comando> [<args>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14489,20 +14904,65 @@ msgstr ""
 "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
 "para leer sobre un subcomando o concepto específico."
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "no se entregó directorio para --git-dir\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "no se entregó namespace para --namespace\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "no se entregó directorio para --work-tree\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "no se entregó prefijo para --super-prefix\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c espera un string de configuración\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "no se entregó directorio para -C\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "opción %s desconocida\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "fallo al ejecutar comando '%s': %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegación de control no es soportada con cURL < 7.22.0"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14513,16 +14973,16 @@ msgstr ""
 "  preguntaba por: %s\n"
 "   redireccionamiento: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "filtrado de objeto"
 
@@ -14540,7 +15000,7 @@ msgstr "examina el historial y el estado (ver también: git help revisions)"
 
 #: common-cmds.h:12
 msgid "grow, mark and tweak your common history"
-msgstr "crece, marca y ajusta tu historial comun"
+msgstr "crece, marca y ajusta tu historial común"
 
 #: common-cmds.h:13
 msgid "collaborate (see also: git help workflows)"
@@ -14548,11 +15008,11 @@ msgstr "colabora (mira también: git help workflows)"
 
 #: common-cmds.h:17
 msgid "Add file contents to the index"
-msgstr "Agrega contenido de carpetas al indice"
+msgstr "Agrega contenido de carpetas al índice"
 
 #: common-cmds.h:18
 msgid "Use binary search to find the commit that introduced a bug"
-msgstr "use la búsqueda binaria para encontrar el commit que introdujo el bug"
+msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
 
 #: common-cmds.h:19
 msgid "List, create, or delete branches"
@@ -14596,7 +15056,7 @@ msgstr "Junta dos o mas historiales de desarrollo juntos"
 
 #: common-cmds.h:29
 msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbolicos"
+msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
 
 #: common-cmds.h:30
 msgid "Fetch from and integrate with another repository or a local branch"
@@ -14616,7 +15076,7 @@ msgstr "Reinicia el HEAD actual a un estado especifico"
 
 #: common-cmds.h:34
 msgid "Remove files from the working tree and from the index"
-msgstr "Borra archivos del árbol de trabajo y del indice"
+msgstr "Borra archivos del árbol de trabajo y del índice"
 
 #: common-cmds.h:35
 msgid "Show various types of objects"
@@ -14630,25 +15090,25 @@ msgstr "Muestra el estado del árbol de trabajo"
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "fecha de expiración"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "ser mas verboso"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "ser mas discreto"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
-msgstr "usa <n> digitos para mostrar SHA-1s"
+msgstr "usa <n> dígitos para mostrar SHA-1s"
 
 #: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
@@ -14665,7 +15125,7 @@ msgstr "Debes iniciar con \"git bisect start\""
 #. at this point.
 #: git-bisect.sh:60
 msgid "Do you want me to do it for you [Y/n]? "
-msgstr "¿Quieres que lo haga por ti [Y/n]?"
+msgstr "¿Quieres que lo haga por ti [Y/n]? "
 
 #: git-bisect.sh:121
 #, sh-format
@@ -14690,7 +15150,7 @@ msgstr ""
 
 #: git-bisect.sh:177
 msgid "won't bisect on cg-seek'ed tree"
-msgstr "no se bisectará en un árbol con cg-seek"
+msgstr "no se bisecará en un árbol con cg-seek"
 
 #: git-bisect.sh:181
 msgid "Bad HEAD - strange symbolic ref"
@@ -14724,14 +15184,14 @@ msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
 #: git-bisect.sh:306
 #, sh-format
 msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Peligro: bisectando solo con un $TERM_BAD commit."
+msgstr "Peligro: bisecando solo con un $TERM_BAD commit."
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
 #: git-bisect.sh:312
 msgid "Are you sure [Y/n]? "
-msgstr "¿Estás seguro [Y/n]?"
+msgstr "¿Estás seguro [Y/n]? "
 
 #: git-bisect.sh:324
 #, sh-format
@@ -14755,7 +15215,7 @@ msgstr ""
 
 #: git-bisect.sh:398 git-bisect.sh:512
 msgid "We are not bisecting."
-msgstr "No estamos bisectando."
+msgstr "No estamos bisecando."
 
 #: git-bisect.sh:405
 #, sh-format
@@ -14786,7 +15246,7 @@ msgstr "?? ¿De qué estás hablando?"
 
 #: git-bisect.sh:453
 msgid "bisect run failed: no command provided."
-msgstr "bisect falló: no se proveyó comando"
+msgstr "bisect falló: no se proveyó comando."
 
 #: git-bisect.sh:458
 #, sh-format
@@ -14823,7 +15283,7 @@ msgstr "bisect exitoso"
 #, sh-format
 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
 msgstr ""
-"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD"
+"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD."
 
 #: git-bisect.sh:567
 msgid "no terms defined"
@@ -14853,7 +15313,7 @@ msgstr "Fusión automatizada no funcionó."
 
 #: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
-msgstr "No debería hacer un pulpo"
+msgstr "No debería hacer un pulpo."
 
 #: git-merge-octopus.sh:73
 #, sh-format
@@ -14879,7 +15339,7 @@ msgstr "Intentando fusión simple con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -14894,50 +15354,50 @@ msgstr ""
 "Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
 "rebase --abort\"."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No se puede regresar a $head_name"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "Autostash aplicado."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "No se puede almacenar $stash_sha1"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazó el rebase."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "No hay rebase en progreso?"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
-"Tienes que editar todos los conflictos de fusion y luego\n"
+"Tienes que editar todos los conflictos de fusión y luego\n"
 "marcarlos como resueltos usando git add"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14958,75 +15418,76 @@ msgstr ""
 "y ejecúteme nuevamente.  Me estoy deteniendo en caso de que tenga\n"
 "algo de valor ahí."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "upstream inválido '$upstream_name'"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: hay más de una base de fusión"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: no hay base de fusión"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "No apunta a un commit válido: $onto_name"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "fatal: no existe la rama/commit: '$branch_name'"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Autostash creado: $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
-msgstr "Por favor, confírmalos o salvaguárdalos."
+msgstr "Por favor, confírmalos o guárdalos."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
-msgstr "HEAD está actualizado"
+msgstr "HEAD está actualizado."
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La rama actual $branch_name está actualizada."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD está actualizado, rebase forzado."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Rama actual $branch_name está actualizada, rebase forzado."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Cambios desde $mb a $onto:"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
-"Primero, rebobinando head para reproducir tu trabajo en la cima de él..."
+"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
+"de ésta..."
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Avance rápido de $branch_name a $onto_name."
@@ -15037,7 +15498,7 @@ msgstr "git stash clear con parámetros no está implementado"
 
 #: git-stash.sh:108
 msgid "You do not have the initial commit yet"
-msgstr "Aún no tienes un commit inicial."
+msgstr "Aún no tienes un commit inicial"
 
 #: git-stash.sh:123
 msgid "Cannot save the current index state"
@@ -15094,86 +15555,86 @@ msgstr "No se puede guardar el estado actual"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden remover cambios del árbol de trabajo"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opción desconocida: $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Se especificaron demasiadas revisiones: $REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no es una referencia válida"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no es un commit estilo stash"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no es una referencia stash"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "incapaz de refrescar el índice"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No se puede aplicar un stash en medio de una fusión"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflictos en índice. Intente sin --index."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "No se puede guardar el índice del árbol"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "No se puede sacar de stage archivos modificados"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Botado ${REV} ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No se pudo borrar entrada stash"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
-msgstr "No se especificó el nombre de la rama."
+msgstr "No se especificó el nombre de la rama"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para restaurarlos, escribe \"git stash apply\")"
 
@@ -15186,7 +15647,7 @@ msgstr ""
 #: git-submodule.sh:191
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL del repositorio: '$repo' debe ser absoluta o iniciar con ./|../"
+msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
 
 #: git-submodule.sh:210
 #, sh-format
@@ -15212,7 +15673,7 @@ msgstr ""
 #: git-submodule.sh:237
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Agregar al índice el repositorio existente en '$sm_path'"
+msgstr "Agregando el repositorio existente en '$sm_path' al índice"
 
 #: git-submodule.sh:239
 #, sh-format
@@ -15274,69 +15735,19 @@ msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 "Deteniendo en '$displaypath'; script retornó un status distinto de cero."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "pathspec y --all son incompatibles"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"El árbol de trabajo del submódulo '$displaypath' contiene un directorio ."
-"git \n"
-"(use 'rm -rf' si realmente quiere removerlo incluyendo todo en su historia)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"El árbol de trabajo '$displaypath' contiene modificaciones locales; usa '-f' "
-"para descartarlos"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Directorio '$displaypath' limpiado"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "No se pudo eliminar el árbol de trabajo del submódulo '$displaypath'"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "No se pudo crear el directorio vacío '$displaypath' para el submódulo"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"Anulado el registro del submódulo '$name' ($url) para la ruta '$displaypath'"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No se pudo encontrar la revisión actual en la ruta de submódulo "
 "'$displaypath'"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15345,12 +15756,12 @@ msgstr ""
 "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
 "de submódulo  '$sm_path'"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15359,84 +15770,79 @@ msgstr ""
 "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
 "Fetch directo del commit falló."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
 "'$displaypath'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz de fusionar '$sha1' en la ruta '$displaypath' del submódulo"
+msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Falló la ejecución  de  '$command $sha1' en la ruta de submódulo "
 "'$displaypath'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "La opción --cached no puede ser usada con la opción --files"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "modo $mod_dst inesperado"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_src"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_dst"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
-"Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
-
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Sincronizando url de submódulo para '$displaypath'"
+"  Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
 
 #: git-parse-remote.sh:89
 #, sh-format
@@ -15491,7 +15897,7 @@ msgstr ""
 "\n"
 "Si remueves una línea aquí EL COMMIT SE PERDER�.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15510,83 +15916,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: no es un commit que pueda ser cogido"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nombre de commit inválido: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "No se puede escribir el remplazo sha1 del commit actual"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avance rápido a $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "No se puede realizar avance rápido a $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "No se puede mover HEAD a $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Rehusando a ejecutar squash en fusión: $sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Error rehaciendo fusión $sha1"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "No se pudo coger $sha1"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Este es el mensaje del commit #${n}:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "El mensaje del commit  #${n} será ignorado:"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Esta es una combinación de $count commit."
 msgstr[1] "Esta es la combinación de $count commits."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "No se puede escribir $fixup_msg"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "Esto es una combinación de 2 commits."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "No se puede aplicar $sha1... $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15603,31 +16009,31 @@ msgstr ""
 "problema antes\n"
 "de que sea capaz de reformular el commit."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Detenido en $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
-msgstr "no se puede '$squash_style' sin un commit previo"
+msgstr "No se puede '$squash_style' sin un commit previo"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Ejecutando: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ejecución fallida: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "y hizo cambios al índice y/o al árbol de trabajo"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15638,7 +16044,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15653,29 +16059,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Comando desconocido: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "$head_name rebasado y actualizado satisfactoriamente."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
-msgstr "No se puede desacoplar HEAD"
+msgstr "no se puede desacoplar HEAD"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "No se pudo remover CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15706,12 +16112,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
-"Error tratando de encontrar la identidad del autor para remediar el commit "
+"Error tratando de encontrar la identidad del autor para remediar el commit"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15719,11 +16125,11 @@ msgstr ""
 "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
 "primero y entonces ejecuta 'git rebase --continue' de nuevo."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
-msgstr "No se pudo realizar el commit con los cambios en el área de stage"
+msgstr "No se pudo realizar el commit con los cambios en el área de stage."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15737,44 +16143,44 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "No se pudo ejecutar el editor"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "¿Sin HEAD?"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "No se pudo crear $state_dir temporalmente"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "No se pudo marcar como interactivo"
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "No se puede inicializar los commits reescritos"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "No se pudo generar lista de pendientes"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
 msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15784,7 +16190,7 @@ msgstr ""
 "Como sea, si se remueve todo, el rebase sera abortado.\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Tenga en cuenta que los commits vacíos están comentados"
 
@@ -15813,7 +16219,7 @@ msgstr ""
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "No se puede reescribir las ramas: Tienes cambios que no están en el área de "
-"stage"
+"stage."
 
 #: git-sh-setup.sh:226
 msgid "Cannot pull with rebase: You have unstaged changes."
@@ -15824,7 +16230,7 @@ msgstr ""
 #: git-sh-setup.sh:229
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
-msgstr "No se puede $action: Tienes cambios que no están en el área de stage"
+msgstr "No se puede $action: Tienes cambios que no están en el área de stage."
 
 #: git-sh-setup.sh:242
 msgid "Cannot rebase: Your index contains uncommitted changes."
@@ -15932,7 +16338,7 @@ msgstr "Agregar no rastreados"
 msgid "No untracked files.\n"
 msgstr "No hay archivos sin rastrear.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15940,7 +16346,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para el área de stage."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15948,7 +16354,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para aplicar stash."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15956,7 +16362,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para sacar del área de stage."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15964,7 +16370,7 @@ msgstr ""
 "Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
 "inmediatamente para aplicar."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15972,16 +16378,16 @@ msgstr ""
 "Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
 "inmediatamente para descarte."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "fallo al abrir el archivo de adición del hunk para escritura: %s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -15995,7 +16401,7 @@ msgstr ""
 "Lineas comenzando con  %s serán removidas.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -16005,7 +16411,7 @@ msgstr ""
 "editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n"
 "la edición es abortada y el hunk queda sin cambios.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s"
@@ -16016,13 +16422,13 @@ msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -16037,7 +16443,7 @@ msgstr ""
 "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
 "archivo"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -16051,7 +16457,7 @@ msgstr ""
 "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
 "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -16066,7 +16472,7 @@ msgstr ""
 "d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
 "archivo"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -16074,13 +16480,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al indice\n"
-"n - no aplicar este hunk al indice\n"
+"y - aplicar este hunk al índice\n"
+"n - no aplicar este hunk al índice\n"
 "q - quit; no aplicar este hunk o ninguno de los restantes\n"
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunko ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -16094,7 +16500,7 @@ msgstr ""
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno de los posteriores en el archivo"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16108,7 +16514,7 @@ msgstr ""
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno posterior en el archivo"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16116,13 +16522,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al indice y al árbol de trabajo\n"
-"n - no aplicar este hunk al indice y al árbol de trabajo\n"
+"y - aplicar este hunk al índice y al árbol de trabajo\n"
+"n - no aplicar este hunk al índice y al árbol de trabajo\n"
 "q - quit;  no aplicar este hunk o ninguno de los restantes\n"
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunk o ninguno de los siguientes en este archivo"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16144,199 +16550,213 @@ msgstr ""
 "e - editar manualmente el hunk actual\n"
 "? - imprimir ayuda\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Los hunks seleccionados no aplican al índice!\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
-msgstr "Aplicarlos al árbol de trabajo de todas maneras?"
+msgstr "Aplicarlos al árbol de trabajo de todas maneras? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "Nada fue aplicado.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorando lo no fusionado: %s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Solo cambiaron archivos binarios.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "Sin cambios.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Actualización del parche"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar stage al cambio de modo [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar stage al borrado [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar stage a este hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar stash al cambio de modo [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar stash al borrado [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar stash a este hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Sacar cambio de modo del stage [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Sacar borrado del stage [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Sacar este hunk del stage [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar cambio de modo al índice [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar borrado al índice [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar este hunk al índice [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? "
+"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d,/"
-"%s,?]? "
+"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "No hay más pedazos para el ir\n"
+
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
-msgstr "A que hunk ir (<enter> para ver mas)?"
+msgstr "a que hunk ir (<enter> para ver mas)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
-msgstr "A que hunk ir?"
+msgstr "a que hunk ir? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Numero invalido: '%s'\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Lo siento, solo %d hunk disponible.\n"
 msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "No hay más pedazos para buscar\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
-msgstr "buscar para regexp?"
+msgstr "buscar para regexp? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
-msgstr "regexp para la búsqueda mal formado %s: %s\n"
+msgstr "Regexp para la búsqueda mal formado %s: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "No hay hunks que concuerden con el patrón entregado.\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "No el anterior hunk\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "No el siguiente hunk\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Perdón, no se puede dividir este pedazo\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Cortar en %d hunk.\n"
 msgstr[1] "Cortar en  %d hunks.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Perdón, no se puede editar este pedazo\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Revisión de  diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16352,89 +16772,97 @@ msgstr ""
 "revert        - revierte los cambios en el área de stage de regreso a la "
 "versión HEAD\n"
 "patch         - selecciona los hunks y actualiza de forma selectiva\n"
-"diff          - mirar la diff entre HEAD y el indice\n"
+"diff          - mirar la diff entre HEAD y el índice\n"
 "add untracked - agrega contenidos de archivos no rastreados al grupo de "
 "cambios del area de stage\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "falta --"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modo --patch desconocido: %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argumento invalido %s, se esperaba --"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "el editor se cerro inapropiadamente, abortando todo"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contiene una versión intermedia del correo que se estaba generando.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contiene el email generado.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases no es compatible con otras opciones.\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"`batch-size` y `relogin` deben ser especificados juntos (via la línea de "
+"comando o por opción de configuración)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr "campo --suppress-cc desconocido: '%s'\n"
+msgstr "Campo --suppress-cc desconocido: '%s'\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Configuración --confirm desconocida: '%s'\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "peligro: alias de sendmail  con comillas no es soportado: %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "peligro: `:include:` no soportado: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr "Advertencia: redirección `/file` o `|pipe` no soportada : %s\n"
+msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
-msgstr "Advertencia: línea sendmail no reconocida: %s\n"
+msgstr "advertencia: línea sendmail no reconocida: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16449,12 +16877,12 @@ msgstr ""
 "    * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
 "    * Agregando la opción --format-patch si se quiere decir un rango.\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fallo al abrir directorio %s: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16463,7 +16891,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "peligro: no se mandaron parches\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16473,17 +16901,17 @@ msgstr ""
 "No se especificaron parches!\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "No hay línea de subject en %s?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fallo al abrir para escritura %s: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16491,38 +16919,33 @@ msgid ""
 "\n"
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
-"Lineas que comienzan en \"GIT:\" seran removidas.\n"
+"Lineas que comienzan en \"GIT:\" serán removidas.\n"
 "Considere incluir un diffstat global o una tabla de contenidos\n"
 "para el parche que esta escribiendo.\n"
 "\n"
 "Limpiar el contenido de body si usted no desea mandar un resumen.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Fallo al abrir %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fallo al abrir %s: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr ""
-"Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Fallo al abrir %s.final: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "Archivo de resumen esta vacío, saltando al siguiente\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "Esta seguro de que desea usar <%s> [y/N]?"
+msgstr "Esta seguro de que desea usar <%s> [y/N]? "
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16530,11 +16953,11 @@ msgstr ""
 "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Que codificación de 8bit debería declarar [UTF-8]?"
+msgstr "Que codificación de 8bit debería declarar [UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16547,22 +16970,22 @@ msgstr ""
 "tiene el template  '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
 "deseas mandar.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "A quien se deben mandar los correos (si existe)?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: alias '%s' se expande a si mismo\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
-"que id de mensaje sera usado como En-Respuesta-Para en el primer email (si "
-"existe alguno)?"
+"Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si "
+"existe alguno)? "
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "error: no es posible extraer una dirección valida de %s\n"
@@ -16570,16 +16993,16 @@ msgstr "error: no es posible extraer una dirección valida de %s\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar):"
+msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
-msgstr "ruta CA \"%s\" no existe"
+msgstr "Ruta CA \"%s\" no existe"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16592,147 +17015,169 @@ msgid ""
 "    run 'git config --global sendemail.confirm auto'.\n"
 "\n"
 msgstr ""
-"La lista Cc ha sido expandida por direcciones adicionales\n"
-"encontradas en el mensaje de commit parchado.. Por defecto\n"
-"send-email se muestra antes de mandar cualquier cada vez que esto sucede.\n"
-"Este comportamiento is controlado por el valor de configuración sendemail."
-"confirm.\n"
+"    La lista Cc ha sido expandida por direcciones adicionales\n"
+"    encontradas en el mensaje de commit parchado.. Por defecto\n"
+"    send-email se muestra antes de mandar cualquier cada vez que esto "
+"sucede.\n"
+"    Este comportamiento is controlado por el valor de configuración "
+"sendemail.confirm.\n"
 "\n"
-"Para mas información, corre 'git sen-email --help'.\n"
-"Para mantener el comportamiento actual, pero evitar este mensaje,\n"
-"corre 'git config --global sendemail.confirm auto'.\n"
+"    Para mas información, ejecuta 'git send-email --help'.\n"
+"    Para mantener el comportamiento actual, pero evitar este mensaje,\n"
+"    ejecuta 'git config --global sendemail.confirm auto'.\n"
 "\n"
 
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
-msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):"
+msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo): "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Necesitas mandar esta respuesta de email"
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP no esta definido adecuadamente."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servidor no soporta STARTTLS! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
-msgstr "fallo de STARTTLS! %s"
+msgstr "Falló STARTTLS! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
 "smtp-debug."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fallo al enviar %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Dry-Sent %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Log dice:\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
-msgstr "Resultado:"
+msgstr "Resultado: "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "no se puede abrir el archivo %s"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Agregando cc: %s de línea '%s'\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no se pudo ejecutar '%s'"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Agregando %s: %s de: '%s'\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) fallo al cerrar el pipe para '%s'"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "no se puede mandar mensaje como 7bit"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia invalida"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no es posible abrir %s: %s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: el parche contiene una línea con mas de 998 caracteres"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
-msgstr "Realmente deseas mandar %s?[y|N]"
+msgstr "Realmente deseas mandar %s?[y|N]: "
+
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "expresión filter-spec inválida '%s'"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "La copia del parche que fallido se encuentra en: %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "pathspec y --all son incompatibles"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "Anulado el registro del submódulo '$name' ($url) para la ruta "
+#~ "'$displaypath'"
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr ""
+#~ "Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n"
 
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
diff --git a/po/fr.po b/po/fr.po
index 3aa1e3c..d45ee87 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -74,8 +74,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-07 18:53+0100\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-23 23:03+0100\n"
 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -126,7 +126,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
@@ -546,7 +546,7 @@ msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "échec de make_cache_entry pour le chemin '%s'"
@@ -624,7 +624,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -682,11 +682,11 @@ msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "chemin"
@@ -699,7 +699,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "num"
 
@@ -740,80 +740,80 @@ msgstr "appliquer les patch sans toucher à la copie de travail"
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construire un index temporaire fondé sur l'information de l'index embarqué"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "action"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
 "d'espace"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre à au moins une ligne de contexte"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "mode verbeux"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolérer des erreurs de détection de retours chariot manquants en fin de "
 "fichier"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "racine"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
@@ -849,7 +849,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "préfixe"
 
@@ -857,11 +857,11 @@ msgstr "préfixe"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "fichier"
 
@@ -893,8 +893,8 @@ msgstr "compression efficace"
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "dépôt"
 
@@ -945,22 +945,22 @@ msgstr ""
 "Les motifs de négation sont ignorés dans les attributs git\n"
 "Utilisez '\\!' pour un point d'exclamation littéral."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Contenu mal cité dans le fichier '%s' : %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Impossible de pousser la bissection plus loin !\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s n'est pas un nom de commit valide"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -969,7 +969,7 @@ msgstr ""
 "La base de fusion %s est mauvaise.\n"
 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -978,7 +978,7 @@ msgstr ""
 "La base de fusion %s est nouvelle.\n"
 "La propriété a changé entre %s et [%s].\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -987,7 +987,7 @@ msgstr ""
 "La base de fusion %s est %s.\n"
 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -998,7 +998,7 @@ msgstr ""
 "git bisect ne peut pas fonctionner correctement dans ce cas.\n"
 "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1015,31 +1015,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissection : une base de fusion doit être testée\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une révision %s est nécessaire"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s était à la fois %s et %s\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Aucun commit testable n'a été trouvé\n"
 "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1058,47 +1058,47 @@ msgstr[1] "(à peu près %d étapes)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bissection : %d révision à tester après cette %s\n"
 msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents et --reverse ne font pas bon ménage."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
 "dernier commit"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "échec de la préparation du parcours des révisions"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
 "premier parent"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "pas de chemin %s dans %s"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "impossible de lire le blob %s  pour le chemin %s"
@@ -1261,76 +1261,75 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Le colis contient cette référence :"
 msgstr[1] "Le colis contient ces %d références :"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "Le colis enregistre l'historique complet."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Le colis exige cette référence :"
 msgstr[1] "Le colis exige ces %d références :"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "Impossible de créer des objets groupés"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "les objets groupés ont disparu"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "rev-list a disparu"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "la référence '%s' est exclue par les options de rev-list"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "Refus de créer un colis vide."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
@@ -1340,7 +1339,7 @@ msgstr "impossible d'analyser %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s n'est pas un commit !"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1461,71 +1460,71 @@ msgstr "'%s' pour '%s' n'est pas un horodatage valide"
 msgid "bad zlib compression level %d"
 msgstr "niveau de compression zlib incorrect %d"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "niveau de compression du paquet %d"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
 "défaut"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
 "100"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "impossible d'analyser '%s' depuis le configuration en ligne de commande"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "échec de fstat sur %s"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de régler '%s' à '%s'"
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossible de désinitialiser '%s'"
@@ -1546,24 +1545,29 @@ msgstr ""
 "Veuillez vérifier que vous avez les droits d'accès\n"
 "et que le dépôt existe."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "Vérification de la connectivité"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "Impossible de lancer 'git rev-list'"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "impossible d'écrire dans la rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "impossible de fermer l'entrée standard du rev-list"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "Les CRLF seraient remplacés par des LF dans %s."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1572,12 +1576,12 @@ msgstr ""
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "
 "travail."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "Les CRLF seraient remplacés par des LF dans %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "Les LF seraient remplacés par des CRLF dans %s"
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1587,11 +1591,6 @@ msgstr ""
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "
 "travail."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "Les LF seraient remplacés par des CRLF dans %s"
-
 #: date.c:116
 msgid "in the future"
 msgstr "dans le futur"
@@ -1708,20 +1707,24 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrêt à %s"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1730,24 +1733,24 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "détection de renommage inexact annulée à cause d'un trop grand nombre de "
 "fichiers."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "recherche uniquement des copies par modification de chemin à cause d'un trop "
 "grand nombre de fichiers."
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1755,20 +1758,25 @@ msgstr ""
 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
 "commande."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "impossible d'ouvrir le répertoire '%s'"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossible de créer les répertoires pour %s"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
@@ -1789,184 +1797,192 @@ msgstr "Filtrage du contenu"
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Dépôt distant sans URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : list courte attendue"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "erreur distante : %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc nécessite multi_ack_detailed"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalide : %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ligne de fin de superficiel invalide : %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvé : %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "Erreur dans l'objet : %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Pas de superficiel trouvé : %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "superficiel/non superficiel attendu, %s trouvé"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "réponse %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvé (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminé"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s déjà possédé (%s)"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocole : mauvais entête de paquet"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "échec de %s"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le démultiplexer latéral"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "Le serveur supporte multi_ack_detailed"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "Le serveur support no-done"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "Le serveur supporte multi_ack"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "Le serveur supporte side-band-64k"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "Le serveru supporte side-band"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Le serveur supporte allow-tip-sha1-in-want"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Le serveur supporte allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
-msgstr "Le serveur support ofs-delta"
+msgstr "Le serveur supporte ofs-delta"
+
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Le serveur supporte filter"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gère pas --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gère pas --shallow-exclude"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gère pas --deepen"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack : échec de le récupération."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "référence distante inconnue %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
@@ -1989,17 +2005,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "échec du stat de '%s'"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquée"
@@ -2143,19 +2160,18 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"
 msgid "name consists only of disallowed characters: %s"
 msgstr "le nom n'est constitué que de caractères interdits : %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "impossible de combiner des types multiples de filtre d'objets"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "impossible de combiner des spécificateurs multiples de filtre"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "expression de filtre invalide : '%s'"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "impossible de modifier le prometteur distant de clone partiel"
 
 #: lockfile.c:151
 #, c-format
@@ -2185,8 +2201,8 @@ msgstr "Impossible de créer '%s.lock' : %s"
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"
 
@@ -2203,60 +2219,60 @@ msgstr "échec de addinfo_cache pour le chemin '%s'"
 msgid "error building trees"
 msgstr "erreur de construction des arbres"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "impossible de créer le chemin '%s' %s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": peut-être un conflit D/F ?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "refus de perdre le fichier non suivi '%s'"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "échec à l'ouverture de '%s' : %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "échec à la création du lien symbolique '%s' : %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ne sait pas traiter %06o %s '%s'"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "Échec à l'exécution de la fusion interne"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossible d'ajouter %s à la base de données"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2265,7 +2281,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
 "%s laissée dans l'arbre."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2274,7 +2290,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
 "%s de %s laissée dans l'arbre."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2283,7 +2299,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
 "%s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2292,20 +2308,20 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
 "%s de %s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "renommage"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "renommé"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2314,142 +2330,142 @@ msgstr ""
 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (laissé non résolu)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
 ">'%s' dans %s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Renommage de %s en %s et de %s en %s à la place"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "Ajout de %s fusionné"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Ajout plutôt comme %s"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objet %s n'est pas un blob"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "modification"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "modifié"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "contenu"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "ajout/ajout"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s sauté (fusion identique à l'existant)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Fusion automatique de %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "sous-module"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "fichier/répertoire"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "répertoire/fichier"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "Index sale : fusion impossible (sales : %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "Déjà à jour !"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u ancêtre commun trouvé :"
 msgstr[1] "%u ancêtres communs trouvés :"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 
@@ -2469,16 +2485,16 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
@@ -2487,7 +2503,7 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Mauvaise valeur de %s : '%s'"
@@ -2497,26 +2513,26 @@ msgstr "Mauvaise valeur de %s : '%s'"
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
@@ -2524,17 +2540,17 @@ msgstr "usage : %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2631,7 +2647,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique"
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2640,7 +2656,7 @@ msgstr ""
 "version d'index renseignée, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2649,22 +2665,22 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "stat impossible de '%s'"
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossible d'ouvrir le répertoire git : %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "échec lors de l'unlink : %s"
@@ -2683,19 +2699,19 @@ msgstr "mises à jour des références interdites en environnement de quarantain
 msgid "could not remove reference %s"
 msgstr "impossible de supprimer la référence %s"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Impossible de supprimer la référence %s : %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossible de supprimer les références : %s"
 
 # à priori on parle d'une branche ici
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "disparue"
 
@@ -2889,131 +2905,141 @@ msgstr "(HEAD détachée depuis %s)"
 msgid "(no branch)"
 msgstr "(aucune branche)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objet manquant %s pour %s"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "echec de parse_object_buffer sur %s pour %s"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objet malformé à '%s'"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "réf avec un nom cassé %s ignoré"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "réf cassé %s ignoré"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Impossible de récupérer à la fois %s et %s pour %s"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit à la fois %s et %s"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurée pour la branche '%s'"
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
 "branche locale de suivi"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussée"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les références de spec pour '%s' n'incluent pas '%s'"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de résoudre une poussée 'simple' pour une destination unique"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Votre branche est à jour avec '%s'.\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Votre branche et '%s' font référence à des commits différents.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (utilisez \"%s\" pour plus de détails)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -3025,11 +3051,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
 "en avance rapide.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -3044,29 +3070,29 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergé,\n"
 "et ont %d et %d commits différents chacune respectivement.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent est incompatible avec --bisect"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "échec de l'ouverture de /dev/null"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -3077,24 +3103,28 @@ msgstr ""
 "false`."
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage distant"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "le dépaquetage a échoué : %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussée"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "Le receveur ne gère pas les poussées avec --signed"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -3102,32 +3132,37 @@ msgstr ""
 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "
 "poussées avec --signed"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "Le receveur ne gère pas les poussées avec --atomic"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "Le receveur ne gère pas les options de poussées"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "mode de nettoyage invalide de message de validation '%s'"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Action inconnue : %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3135,7 +3170,7 @@ msgstr ""
 "après résolution des conflits, marquez les chemins corrigés\n"
 "avec 'git add <chemins>' ou 'git rm <chemins>'"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3145,43 +3180,43 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'écrire dans '%s'"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "échec lors de la finalisation de '%s'."
+msgid "failed to finalize '%s'"
+msgstr "échec lors de la finalisation de '%s'"
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "vos modifications locales seraient écrasées par %s."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "validez vos modifications ou les remiser pour continuer."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s : avance rapide"
@@ -3189,20 +3224,20 @@ msgstr "%s : avance rapide"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "impossible de résoudre le commit HEAD"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "impossible de mettre à jour l'arbre de cache"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3231,17 +3266,126 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "échec du crochet 'prepare-commit-msg'"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Votre nom et votre adresse courriel ont été configurés automatiquement en "
+"se\n"
+"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
+"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
+"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
+"instruction dans votre éditeur pour éditer votre fichier de configuration :\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
+"avec :\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
+"fondant\n"
+"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
+"qu'ils sont corrects.\n"
+"Vous pouvez supprimer ce message en les paramétrant explicitement :\n"
+"\n"
+"    git config --global user.name \"Votre Nom\"\n"
+"    git config --global user.email vous@exemple.com\n"
+"\n"
+"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "impossible de retrouver le commit nouvellement créé"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "impossible d'analyser le commit nouvellement créé"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "impossible de résoudre HEAD après création du commit"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "HEAD détachée"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (commit racine)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "impossible de lire HEAD"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s n'est pas un commit !"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "impossible d'analyser le commit HEAD"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "impossible d'analyser l'auteur du commit"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree a échoué à écrire un arbre"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "impossible de lire le message de validation de '%s'"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "échec de l'écriture de l'objet commit"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossible d'analyser le commit parent %s"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3252,7 +3396,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3263,243 +3407,247 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossible d'écrire '%s'"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "Ceci est le premier message de validation :"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossible de lire le message de validation de %s"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ceci est le message de validation numéro %d :"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Le message de validation %d sera ignoré :"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnue : %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionné."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "le commit %s n'a pas de parent %d"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 "une branche principale a été spécifiée mais le commit %s n'est pas une "
 "fusion."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "impossible d'obtenir un message de validation pour %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s n'accepte pas d'argument : '%s'"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument manquant pour %s"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "impossible de lire '%s'."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un picorage ou un retour est déjà en cours"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "impossible de mettre à jour %s"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "impossible de lire l'index"
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3514,11 +3662,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "et a mis à jour l'index ou l'arbre de travail\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3535,17 +3683,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3556,57 +3704,52 @@ msgstr ""
 "Vos  modifications sont à l'abri dans la remise.\n"
 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "arrêt à %s... %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "impossible de mettre à jour %s"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3616,45 +3759,45 @@ msgstr ""
 "Vous avez des modifications non validées dans votre copie de travail.\n"
 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script : options non gérées"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script : erreur lors de la préparation des révisions"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "liste à faire inutilisable : '%s'"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3663,7 +3806,7 @@ msgstr ""
 "Attention : certains commits ont pu être accidentellement supprimés.\n"
 "Commits supprimés (du plus jeune au plus vieux) :\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3681,7 +3824,7 @@ msgstr ""
 "Les comportements disponibles sont : ignore, warn, error.\n"
 "\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3692,21 +3835,26 @@ msgstr ""
 "rebase --continue'.\n"
 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "le script a déjà été réarrangé."
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s' est hors du dépôt"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3728,6 +3876,11 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "l'option '%s' doit être présente avant les arguments qui ne sont pas des options"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3739,77 +3892,144 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "impossible de mettre en place le répertoire de travail en utilisant une configuration invalide"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "Cette opération doit être effectuée dans un arbre de travail"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Version attendue du dépôt git <= %d, %d trouvée"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "extensions de dépôt inconnues trouvées :"
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
+msgid "error opening '%s'"
+msgstr "erreur à l'ouverture de '%s'"
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "Impossible de revenir au répertoire de travail courant"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "trop gros pour être une fichier .git : '%s'"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "erreur à la lecture de %s"
 
-#: setup.c:1052
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "format de fichier git invalide : %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "aucun chemin dans le fichier git : %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "ce n'est pas un dépôt git : %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' trop gros"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "ce n'est pas un dépôt git : '%s'"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "impossible de revenir au répertoire de travail courant"
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "échec du stat de '%*s%s%s'"
+
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accéder au répertoire de travail courant"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "Impossible de modifié en '%s'"
+msgid "cannot change to '%s'"
+msgstr "impossible de modifier en '%s'"
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"Ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "
-"n'est un dépôt git\n"
-"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"n'est pas activé)."
+"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) n'est un dépôt git\n"
+"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM n'est pas défini)."
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Problème avec la valeur de core.sharedRepository (0%.3o).\n"
-"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
-"écriture."
+"problème avec la valeur de core.sharedRepository (0%.3o).\n"
+"Le propriétaire des fichiers doit toujours avoir les droits en lecture et écriture."
+
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "échec de l'ouverture ou au dup de /dev/null"
 
-#: sha1_file.c:598
+#: setup.c:1230
+msgid "fork failed"
+msgstr "échec de la bifurcation"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "échec du setsid"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "le chemin '%s' n'existe pas"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
 "encore supporté."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "le dépôt de référence '%s' est superficiel"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "le dépôt de référence '%s' est greffé"
@@ -3889,7 +4109,7 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Échec de résolution de HEAD comme référence valide."
 
@@ -3913,7 +4133,7 @@ msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
 msgid "submodule '%s' has dirty index"
 msgstr "le sous-module '%s' a un index sale"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3921,18 +4141,18 @@ msgstr ""
 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
 "n'est pas supporté"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossible de trouve le nom pour le sous-module '%s'"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le répertoire '%s'"
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3943,20 +4163,20 @@ msgstr ""
 "'%s' sur\n"
 "'%s'\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "impossible de démarrer ls-files dans .."
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree a renvoyé un code de retour inattendu %d"
@@ -4034,7 +4254,7 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport : option de profondeur invalide '%s'"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -4043,7 +4263,7 @@ msgstr ""
 "Les chemins suivant de sous-module contiennent des modifications\n"
 "qui ne peuvent être trouvées sur aucun distant :\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -4070,11 +4290,11 @@ msgstr ""
 "pour les pousser vers un serveur distant.\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "Abandon."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "impossible de lire la réf %s"
@@ -4095,7 +4315,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"
 msgid "too-short tree file"
 msgstr "fichier arbre trop court"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4106,7 +4326,7 @@ msgstr ""
 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "
 "branche."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4116,7 +4336,7 @@ msgstr ""
 "l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4126,7 +4346,7 @@ msgstr ""
 "fusion :\n"
 "%%sVeuillez valider ou remiser vos modifications avant la fusion."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4136,7 +4356,7 @@ msgstr ""
 "fusion :\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4145,7 +4365,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%sVeuillez valider ou remiser vos modifications avant %s."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4154,7 +4374,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4164,7 +4384,7 @@ msgstr ""
 "contenus :\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4174,7 +4394,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4183,7 +4403,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4193,7 +4413,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4202,7 +4422,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4212,7 +4432,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4221,7 +4441,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4232,7 +4452,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4242,7 +4462,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4252,7 +4472,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4261,7 +4481,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4271,7 +4491,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4280,12 +4500,12 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4295,7 +4515,7 @@ msgstr ""
 "pas à jour :\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4306,7 +4526,7 @@ msgstr ""
 "jour par l'extraction creuse :\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4317,7 +4537,7 @@ msgstr ""
 "à jour par extraction creuse :\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4326,12 +4546,12 @@ msgstr ""
 "Mise à jour impossible pour le sous-module :\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "Abandon\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "Extraction des fichiers"
 
@@ -4364,18 +4584,43 @@ msgstr "numéro de port invalide"
 msgid "invalid '..' path segment"
 msgstr "segment de chemin '..' invalide"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "échec de la lecture de '%s'"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre de travail"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' n'existe pas"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' ne pointe pas en retour sur '%s'"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/écriture"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossible d'ouvrir '%s' en lecture"
@@ -4389,158 +4634,158 @@ msgstr "impossible d'accéder à '%s'"
 msgid "unable to get current working directory"
 msgstr "impossible d'accéder au répertoire de travail courant"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "Chemins non fusionnés :"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (utilisez \"git reset %s <fichier>...\" pour désindexer)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
 "résolu)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "Modifications qui seront validées :"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
 "validé)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
 "dans la copie de travail)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "supprimé des deux côtés :"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "ajouté par nous :"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "supprimé par eux :"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "ajouté par eux :"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "supprimé par nous :"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "ajouté de deux côtés :"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "modifié des deux côtés :"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "nouveau fichier :"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "copié :"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "supprimé :"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "modifié :"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "renommé :"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "modif. type :"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "inconnu :"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "non fusionné :"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "nouveaux commits, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "contenu modifié, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Votre remisage contient actuellement %d entrée"
 msgstr[1] "Votre remisage contient actuellement %d entrées"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4548,107 +4793,107 @@ msgstr ""
 "Ne touchez pas à la ligne ci-dessus.\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "Vous êtes au milieu d'une session am."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo est manquant."
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "Aucune commande réalisée."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (voir plus dans le fichier %s)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "Aucune commande restante."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "Vous êtes en train de rebaser."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git rebase --continue\")"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (utilisez \"git rebase --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git rebase --continue\")"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4656,128 +4901,128 @@ msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
 "de la branche '%s' sur '%s'."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
 "branche '%s' sur '%s'."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (utilisez \"git commit --amend\" pour corriger le commit actuel)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
 "modifications)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Vous êtes actuellement en train de picorer le commit %s."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Vous êtes actuellement en train de rétablir le commit %s."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git revert --continue\")"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git revert --continue\")"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (utilisez \"git revert --abort\" pour annuler le rétablissement)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "Vous êtes en cours de bissection."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "HEAD détachée sur "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "HEAD détachée depuis "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "Aucun commit"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Fichiers ignorés"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4789,32 +5034,32 @@ msgstr ""
 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
 "status')."
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichés%s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutée à la validation\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4823,67 +5068,71 @@ msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents (utilisez \"git add\" pour les suivre)\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
 "suivre)\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien à valider\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "rien à valider, la copie de travail est propre\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "Encore aucun commit sur "
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "différent"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "derrière "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "devant "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "Impossible de %s : vous avez des modifications non indexées."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "de plus, votre index contient des modifications non validées."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s impossible : votre index contient des modifications non validées."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "échec lors de l'unlink de '%s'"
@@ -4897,7 +5146,7 @@ msgstr "git add [<options>] [--] <chemin>..."
 msgid "unexpected diff status %c"
 msgstr "état de diff inattendu %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
@@ -4946,7 +5195,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4956,7 +5205,7 @@ msgstr "simuler l'action"
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
@@ -5085,10 +5334,10 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n"
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "fichier d'index corrompu"
 
@@ -5140,62 +5389,62 @@ msgstr "décalage horaire invalide"
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
 "abort\"."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
 "points."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5203,38 +5452,29 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree a échoué à écrire un arbre"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "échec de l'écriture de l'objet commit"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "impossible d'être interactif sans entrée standard connectée à un terminal."
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -5242,35 +5482,34 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a échoué à %s %.*s"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "La copie du patch qui a échoué se trouve dans : %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr "Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5281,7 +5520,7 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5294,17 +5533,17 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5312,135 +5551,143 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "être silencieux"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "ajouter une ligne Signed-off-by au message de validation"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "abandonne l'opération de patch mais garde HEAD où il est."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "afficher le patch en cours d'application."
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "id-clé"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5448,17 +5695,17 @@ msgstr ""
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimée. Veuillez ne plus l'utiliser."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5467,7 +5714,7 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
@@ -5491,8 +5738,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive : Dépôt distant sans URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive : ACK/NACK attendu, EOF reçu"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5578,113 +5825,113 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
 "manière incrémentale"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Forcer l'affichage de l'état d'avancement"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Montrer le score de sortie pour les éléments de blâme"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Afficher dans un format propice à la consommation par machine"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "Ignorer les différences d'espace"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr ""
 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "Trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -5698,18 +5945,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "le fichier %s n'a qu'%lu ligne"
 msgstr[1] "le fichier %s n'a que %lu lignes"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "Assignation de blâme aux lignes"
 
@@ -6003,17 +6250,17 @@ msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "clé"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "objet"
 
@@ -6021,16 +6268,16 @@ msgstr "objet"
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "le tri et le filtrage sont non-sensibles à la casse"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format à utiliser pour la sortie"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
@@ -6131,7 +6378,7 @@ msgstr "La création d'un colis requiert un dépôt."
 msgid "Need a repository to unbundle."
 msgstr "Le dépaquetage d'un colis requiert un dépôt."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -6139,7 +6386,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
 "| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6147,66 +6394,66 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<type> peut être : blob, tree, commit ou tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "afficher le type de l'objet"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "afficher avec mise en forme le contenu de l'objet"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "utiliser un chemin spécifique pour --textconv/--filters"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "afficher l'information et le contenu des objets passés en entrée standard"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "afficher l'information des objets passés en entrée standard"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "suivre les liens symbolique internes à la copie de travail (utilisé avec --"
 "batch ou --batch-check)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "montrer tous les objets avec --batch ou --batch-check"
 
@@ -6226,7 +6473,7 @@ msgstr "afficher tous les attributs associés au fichier"
 msgid "use .gitattributes only from the index"
 msgstr "utiliser .gitattributes seulement depuis l'index"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "lire les noms de fichier depuis l'entrée standard"
 
@@ -6235,7 +6482,7 @@ msgid "terminate input and output records by a NUL character"
 msgstr ""
 "terminer les enregistrements en entrée et en sortie par un caractère NUL"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
@@ -6247,27 +6494,27 @@ msgstr "afficher les chemins en entrée qui ne correspondent pas"
 msgid "ignore index when checking"
 msgstr "ignorer l'index pendant la vérification"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossible de spécifier les chemins avec --stdin"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z n'a de sens qu'avec l'option --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "aucun chemin spécifié"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet n'est valide qu'avec un seul chemin"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "impossible d'avoir --quiet et --verbose"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching n'est valide qu'avec --verbose"
 
@@ -6327,9 +6574,9 @@ msgid "write the content to temporary files"
 msgstr "écrire le contenu dans des fichiers temporaires"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "chaîne"
 
@@ -6374,82 +6621,82 @@ msgstr "le chemin '%s' n'a pas les versions nécessaires"
 msgid "path '%s': cannot merge"
 msgstr "chemin '%s' : impossible de fusionner"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' ne peut pas être utilisé avec %s"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
 "même temps."
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6472,7 +6719,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6501,162 +6748,162 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "une seule référence attendue, %d fournies."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "style de conflit (merge (fusion) ou diff3)"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "ne pas vérifier si une autre copie de travail contient le référence fournie"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'état d'avancement"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B et --orphan sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Nom de branche manquant ; essayez -b"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6755,7 +7002,7 @@ msgstr "Sélectionner les éléments à supprimer"
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Au revoir.\n"
@@ -6778,11 +7025,11 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** Commandes ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "Et maintenant ?"
 
@@ -6812,8 +7059,8 @@ msgstr "nettoyage interactif"
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6851,147 +7098,147 @@ msgstr ""
 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "créer un dépôt nu"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "créer un dépôt miroir (implique dépôt nu)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "pour cloner depuis un dépôt local"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "ne pas utiliser de liens durs locaux, toujours copier"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "régler comme dépôt partagé"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "spécificateur de chemin"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "initialiser les sous-modules dans le clone"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de sous-modules clonés en parallèle"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "répertoire depuis lequel les modèles vont être utilisés"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "dépôt de référence"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "profondeur"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "heure"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "créer un clone superficiel depuis une date spécifique"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "révision"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "approfondir l'historique d'un clone superficiel en excluant une révision"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
 "faire"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "tous les sous-modules clonés seront superficiels"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "séparer le répertoire git de la copie de travail"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6999,42 +7246,42 @@ msgstr ""
 "Aucun nom de répertoire n'a pu être deviné\n"
 "Veuillez spécifier un répertoire dans la ligne de commande"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "échec du stat de %s\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -7044,102 +7291,102 @@ msgstr ""
 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD distante réfère à une référence non existante, impossible de "
 "l'extraire.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de unlinker le fichier temporaire alternates"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les options --bare et --origin %s sont incompatibles."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare et --separate-git-dir sont incompatibles."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossible de créer le répertoire de la copie de travail '%s'"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -7147,37 +7394,41 @@ msgstr ""
 "clone --recursive n'est pas compatible avec à la fois --reference et --"
 "reference-if-able"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
 "\"."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
 "\"file://\"."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
@@ -7213,69 +7464,15 @@ msgstr "Remplissage d'espace entre les colonnes"
 msgid "--command must be the first argument"
 msgstr "--command doit être le premier argument"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Votre nom et votre adresse courriel ont été configurés automatiquement en "
-"se\n"
-"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
-"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
-"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
-"instruction dans votre éditeur pour éditer votre fichier de configuration :\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
-"avec :\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
-"fondant\n"
-"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
-"qu'ils sont corrects.\n"
-"Vous pouvez supprimer ce message en les paramétrant explicitement :\n"
-"\n"
-"    git config --global user.name \"Votre Nom\"\n"
-"    git config --global user.email vous@exemple.com\n"
-"\n"
-"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7286,7 +7483,7 @@ msgstr ""
 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
 "supprimer complètement le commit avec \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7301,11 +7498,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Sinon, veuillez utiliser 'git reset'\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7321,61 +7518,61 @@ msgstr ""
 "Puis \"git cherry-pick --continue\" continuera le picorage \n"
 "des commits restants.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7383,38 +7580,38 @@ msgstr ""
 "impossible de sélectionner un caractère de commentaire\n"
 "qui n'est pas utilisé dans le message de validation actuel"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lecture du message de journal depuis l'entrée standard)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7429,7 +7626,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7444,7 +7641,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7454,7 +7651,7 @@ msgstr ""
 "commençant par '%c' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7465,147 +7662,151 @@ msgstr ""
 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
 "si vous le souhaitez. Un message vide abandonne la validation.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
 "auteur existant"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode de fichier ignoré invalide '%s'"
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "--long et -z sont incompatibles"
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "
 "être utilisée."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "calcule les valeurs complètes en avance/en retard"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "afficher l'état en format long (par défaut)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
 "no. (Défaut : all)"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -7613,11 +7814,11 @@ msgstr ""
 "afficher les fichiers ignorés, \"mode\" facultatif : traditional "
 "(traditionnel), matching (correspondant), no. (Défaut : traditional)"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7625,211 +7826,187 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "impossible de retrouver le commit nouvellement créé"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "impossible d'analyser le commit nouvellement créé"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "impossible de résoudre HEAD après création du commit"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "HEAD détachée"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (commit racine)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modèle de message de validation"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "message"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "message de validation"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "réutiliser et éditer le message du commit spécifié"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "réutiliser le message du commit spécifié"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour corriger le commit spécifié"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour compresser le commit spécifié"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "ajouter une entrée Signed-off-by :"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "défaut"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "comment éliminer les espaces et les commentaires # du message"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "inclure l'état dans le modèle de message de validation"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "impossible d'analyser le commit HEAD"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abandon de la validation dû à un message de validation vide.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -8058,24 +8235,24 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
 msgid "tag '%s' is really '%s' here"
 msgstr "l'étiquette '%s' est en fait '%s'"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "
 "describe\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "recherche terminée à %s\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -8084,7 +8261,7 @@ msgstr ""
 "Aucune étiquette annotée ne peut décrire '%s'.\n"
 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -8093,12 +8270,12 @@ msgstr ""
 "Aucune étiquette ne peut décrire '%s'.\n"
 "Essayez --always, ou créez des étiquettes."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits parcourus\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -8108,92 +8285,92 @@ msgstr ""
 "affichées\n"
 "abandon de la recherche à %s\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "décrire %s\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s n'est ni un commit ni un blob"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "rechercher l'étiquette qui suit le commit"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "déboguer la stratégie de recherche sur stderr"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "utiliser n'importe quelle référence"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "utiliser n'importe quelle étiquette, même non-annotée"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "toujours utiliser le format long"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "ne suivre que le premier parent"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "n'afficher que les correspondances exactes"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "ne considérer que les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considérer les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrégés en dernier recours"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "marque"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long et --abbrev=0 sont incompatibles"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken est incompatible avec les commits ou assimilés"
 
@@ -8381,97 +8558,101 @@ msgstr "Appliquer le spécificateur de référence aux références exportées"
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "éliminer les branches de suivi distant si la branche n'existe plus dans le "
 "dépôt distant"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui encombrent les étiquettes modifiées"
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "répertoire"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "préfixer ceci à la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8479,91 +8660,91 @@ msgstr ""
 "par défaut pour la récupération récursive de sous-modules (priorité plus "
 "basse que les fichiers de config)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les références qui mettent à jour .git/shallow"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "spécifier une correspondance de référence pour la récupération"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 "le paramètre de configuration fetch.output contient une valeur invalide %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[mise à jour de l'étiquette]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "impossible de mettre à jour la référence locale"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8572,50 +8753,55 @@ msgstr ""
 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "L'option \"%s\" est ignorée pour %s\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans core.partialClone"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8623,40 +8809,40 @@ msgstr ""
 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
 "distant depuis lesquels les nouvelles révisions devraient être récupérées."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Vous devez spécifier un nom d'étiquette."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "Une profondeur négative dans --deepen n'est pas supportée"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen et --depth sont mutuellement exclusifs"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow sur un dépôt complet n'a pas de sens"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dépôt"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "La récupération d'un groupe et les spécifications de référence n'ont pas de "
@@ -8724,7 +8910,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl"
 msgid "show only <n> matched refs"
 msgstr "n'afficher que <n> références correspondant"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "respecter les couleurs de formatage"
 
@@ -8748,64 +8934,64 @@ msgstr "afficher seulement les références qui contiennent le commit"
 msgid "print only refs which don't contain the commit"
 msgstr "afficher seulement les références qui ne contiennent pas le commit"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "considérer les objets de l'index comme nœuds tête"
 
 # translated from man page
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "considérer les reflogs comme nœuds tête (par défaut)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "écrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms étendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
@@ -8851,35 +9037,35 @@ msgstr "être plus consciencieux (durée de traitement allongée)"
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
 "tourne déjà"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "impossible de lire la valeur de gc.logexpiry %s"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Compression automatique du dépôt en tâche de fond pour optimiser les "
 "performances.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Compression du dépôt pour optimiser les performances.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8887,7 +9073,7 @@ msgstr ""
 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
 "(utilisez --force si ce n'est pas le cas)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8898,12 +9084,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep : échec de création du fil: %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -8912,254 +9098,254 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "impossible de faire un grep sur un objet de type %s"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend un valeur numérique"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "rechercher dans l'index plutôt que dans la copie de travail"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "rechercher récursivement dans chaque sous-module"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
 "afficher le nom de fichier une fois au dessus des correspondances du même "
 "fichier"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr ""
 "afficher une ligne avec le nom de la fonction avant les correspondances"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "n'afficher que les correspondances de fichiers qui correspondent à tous les "
 "motifs"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "afficher l'arbre d'analyse pour le motif grep"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "aucun motif fourni."
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de résoudre la révision : %s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "pas de support des fils, ignore --threads"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "option non supportée avec --recurse-submodules."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "--cached et des arbres sont fournis en même temps."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -9167,38 +9353,38 @@ msgstr ""
 "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
 "[--] <fichier>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "type"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "type d'objet"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "écrire l'objet dans la base de donnée d'objets"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "lire l'objet depuis l'entrée standard"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "stocker le fichier tel quel sans filtrage"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "juste hasher n'importe quel contenu pour créer des objets corrompus pour "
 "debugger Git"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "traiter le fichier comme s'il venait de ce chemin"
 
@@ -9331,152 +9517,152 @@ msgstr "'%s' est un alias de '%s'"
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "type d'objet non correspondant à %s"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "objet attendu non reçu %s"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "impossible de remplir %d octet"
 msgstr[1] "impossible de remplir %d octets"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "fin de fichier prématurée"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "erreur de lecture sur l'entrée"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisés que disponibles"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "le paquet est trop grand pour la définition actuelle de off_t"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dépasse la taille maximale permise"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "impossible d'ouvrir le fichier paquet '%s'"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "la signature du paquet ne correspond pas"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la version de paquet %<PRIu32> non supportée"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "la décompression (inflate) a retourné %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "l'objet delta de base est hors limite"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "type d'objet inconnu %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "impossible de lire (pread) le fichier paquet"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
 msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "grave incohérence dans la décompression (inflate)"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "impossible de lire %s"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossible de lire l'information existante de l'objet %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "impossible de lire l'objet existant %s"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Erreur dans l'objet"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Tous les objets enfants de %s ne sont pas accessibles"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "échec d'application du delta"
 
@@ -9547,77 +9733,81 @@ msgstr "impossible de compresser l'objet ajouté (%d)"
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "erreur en fermeture du fichier paquet"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "impossible d'écrire le fichier \"keep\" '%s'"
+msgid "cannot write %s file '%s'"
+msgstr "impossible d'écrire le fichier %s '%s'"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "impossible de fermer le fichier \"keep\" '%s'"
+msgid "cannot close written %s file '%s'"
+msgstr "impossible de fermer le fichier %s écrit '%s'"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "erreur en fermeture du fichier paquet"
+
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "impossible de stocker le fichier paquet"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "impossible de stocker le fichier d'index"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "pas un delta : %d objet"
 msgstr[1] "pas un delta : %d objets"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longueur chaînée = %d : %lu objet"
 msgstr[1] "longueur chaînée = %d : %lu objets"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "Impossible de revenir au répertoire de travail courant"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
@@ -9801,122 +9991,122 @@ msgstr "--trailer n'a aucune signification avec --only-input"
 msgid "no input file given for in-place editing"
 msgstr "aucun fichier en entrée pour l'éditon sur place"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<options>] <objet>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "Utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "décorer seulement les références correspondant à <motif>"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "ne pas décorer les références correspondant à <motif>"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "décorer les options"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
 "compte à 1"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "Impossible de lire l'objet %s"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Type inconnu : %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "le nom du répertoire de sortie est trop long"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Exactement une plage nécessaire."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "Ceci n'est pas une plage."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "La lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "Deux répertoires de sortie ?"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit inconnu %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Impossible de résoudre '%s' comme une référence valide."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "Impossible de trouver la base de fusion exacte."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9929,230 +10119,230 @@ msgstr ""
 "ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "Impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr ""
 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "ajouter l'en-tête de courriel"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "Ajouter un arbre prérequis à la série de patchs"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr ""
 "afficher la barre de progression durant la phase de génération des patchs"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "-n et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "sortie standard, ou répertoire, lequel ?"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Impossible de créer le répertoire '%s'"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "Génération des patchs"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "Échec de création des fichiers en sortie"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10311,7 +10501,7 @@ msgstr ""
 "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
 "trouvée"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
 
@@ -10358,185 +10548,185 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vide : '%s'"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "ne pas afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "ajouter (au plus <n>) éléments du journal court au message de validation de "
 "la fusion"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "créer une validation unique au lieu de faire une fusion"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion réussit (défaut)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "vérifier que le commit nommé a une signature GPG valide"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "stratégie"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "message de validation de la fusion (pour une fusion sans avance rapide)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "vérifier le crochet commit-msg"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (rien à compresser)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Options inconnue pour merge-recursive : -X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
 "fusion.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10553,70 +10743,70 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "La fusion automatique a échoué ; réglez les conflits et validez le "
 "résultat.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "Pas de branche amont par défaut définie pour la branche courante."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %s : %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10624,7 +10814,7 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10632,114 +10822,114 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Possible de fusionner exactement une seule validation dans une tête vide"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La validation %s n'a pas de signature GPG."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La validation %s a une signature GPG correcte par %s\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "Déjà à jour."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "Déjà à jour. Ouais !"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10896,72 +11086,72 @@ msgstr "%.*s est dans l'index"
 msgid "force move/rename even if target exists"
 msgstr "forcer le déplacement/renommage même si la cible existe"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "sauter les erreurs de déplacement/renommage"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "la destination '%s' n'est pas un répertoire"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Vérification du renommage de '%s' en '%s'\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "mauvaise source"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "impossible de déplacer un répertoire dans lui-même"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "impossible de déplacer un répertoire sur un fichier"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "le répertoire source est vide"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "pas sous le contrôle de version"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "la destination existe"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "écrasement de '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Impossible d'écraser"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "multiples sources pour la même destination"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
@@ -11154,12 +11344,12 @@ msgstr "impossible d'écrire l'objet note"
 msgid "the note contents have been left in %s"
 msgstr "le contenu de la note a été laissé dans %s"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
@@ -11407,7 +11597,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrée standard"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
@@ -11442,194 +11632,198 @@ msgstr ""
 "git pack-objects [options...] base-name [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
 "cause de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "désactivation de l'écriture en bitmap car certains objets ne sont pas "
 "compressés"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "valeur invalide pour --missing"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "ne pas afficher la barre de progression"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "afficher la barre de progression"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "afficher la barre de progression durant la phase d'écrite des objets"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similaire à --all-progress quand la barre de progression est affichée"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "écrire le fichier d'index du paquet dans le format d'index de version "
 "spécifié"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "utiliser des fils lors de la recherche pour une meilleurs correspondance des "
 "deltas"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "inclure les objets référencés par les éléments de reflog"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles détachés"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "utiliser un index en bitmap si disponible pour accélerer le décompte des "
 "objets"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "écrire un index en bitmap associé à l'index de paquet"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "gestion des objets manquants"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
@@ -11657,15 +11851,19 @@ msgstr "Suppression des objets dupliqués"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "afficher les objets éliminés"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "faire expirer les objets plus vieux que <heure>"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
 
@@ -11767,7 +11965,7 @@ msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
 msgid "<remote>"
 msgstr "<distant>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branche>"
@@ -11793,29 +11991,29 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
 "l'index."
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11826,7 +12024,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11843,15 +12041,15 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -12254,39 +12452,43 @@ msgstr "git rebase-helper [<options>]"
 msgid "keep empty commits"
 msgstr "garder les validations vides"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "autoriser les validations avec des messages vides"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "continuer le rebasage"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "abandonner le rebasage"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "créer les script de rebasage"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "raccourcir les identifiants de commits dans la liste à-faire"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "étendre les identifiants de commit dans la liste à-faire"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "vérifier la liste à-faire"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "éviter les commandes de picorage non nécessaires"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "réarranger les lignes fixup/squash"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "insérer les commandes exec dans la liste à-faire"
 
@@ -12294,7 +12496,7 @@ msgstr "insérer les commandes exec dans la liste à-faire"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12324,7 +12526,7 @@ msgstr ""
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
 "réglez « receive.denyCurrentBranch » à 'refuse'."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12344,15 +12546,15 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Vous devez spécifier un répertoire."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' n'est pas un horodatage valide"
@@ -12887,88 +13089,88 @@ msgstr ""
 "Utilisez\n"
 "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "identique à -a et transformer les objets inaccessibles en suspens"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "supprimer les paquets redondants et lancer git-prune-packed"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta à git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object à git-pack-objects"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "ne pas lancer git update-server-info"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local à git-pack-objects"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "écrire un index en bitmap"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "date approximative"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquétiser les objets inaccessibles"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "taille de la fenêtre utilisée pour la compression des deltas"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "limite le nombre maximal de fils"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable et -A sont incompatibles"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "échec de la suppression de '%s'"
@@ -13051,11 +13253,11 @@ msgstr "Modifier les parents d'un commit"
 msgid "replace the ref if it exists"
 msgstr "remplacer la référence si elle existe"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "afficher sans mise en forme pour --edit"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "utiliser ce format"
 
@@ -13115,103 +13317,107 @@ msgstr "Impossible de trouver l'arbre pour HEAD."
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "être silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "réinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
 "tard"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Échec de résolution de '%s' comme une révision valide."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Échec de résolution de '%s' comme un arbre valide."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch est incompatible avec --{hard,mixed,soft}"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
 "place."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N ne peut être utilisé qu'avec --mixed"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "impossible de combiner --exclude-promisor-objects et --missing"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "le filtrage d'objet exige --objects"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "valeur invalide de 'sparse' '%s'"
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
 
@@ -13315,10 +13521,6 @@ msgstr "ajouter le nom de validation"
 msgid "preserve initially empty commits"
 msgstr "préserver les validations vides initialement"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "autoriser les validations avec des messages vides"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "garder les validations redondantes, vides"
@@ -13676,35 +13878,39 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "Référence inexistante : %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de référence complet attendu, %s obtenu"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper  print-default-remote n'accepte aucun argument"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossible de supprimer un composant de l'URL '%s'"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13713,60 +13919,60 @@ msgstr ""
 "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
 "son propre amont d'autorité."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "attention : nous vous suggérons de spécifier une commande de mode de mise à "
 "jour pour le sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
 "'%s'"
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<chemin>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
 "chemin '%s'"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr "supprimer la sortie d'état du sous-module"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -13774,55 +13980,139 @@ msgstr ""
 "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
 "du sous-module"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Parcourir récursivement les sous-modules"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr "L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son historique)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr "L'arbre de travail du sous-module '%s' contient des modifications locales ; utilisez '-f' pour les annuler"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Répertoire '%s' nettoyé\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "impossible de créer le répertoire vide du sous-module %s"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "Éliminer les arbres de travail des sous-modules même s'ils contiennent des modifications locales"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "Désenregistrer tous les sous-modules"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "URL depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "forcer l'affichage de la progression du clonage"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13830,83 +14120,83 @@ msgstr ""
 "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
 "<dépôt>] [--name <nom>] [--depth <profondeur>]  --url <url> --path <chemin>"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "impossible de créer le répertoire de sous-module pour '%s'"
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionné %s non traité"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traité"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Impossible de cloner '%s'. Réessai prévu"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "chemin dans la copie de travail"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "chemin dans la copie de travail, traversant les frontières de sous-modules"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "valeurs possibles : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "jobs parallèles"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "spécifie si le clonage initial doit être aussi superficiel"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "valeur invalide pour la mise à jour du paramètre"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13915,20 +14205,20 @@ msgstr ""
 "la branche du sous-module %s est configurée pour hériter de la branche du "
 "superprojet, mais le superprojet n'est sur aucune branche"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<chemin>...]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gère pas --super-prefix"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -14034,140 +14324,144 @@ msgstr "impossible de signer l'étiquette"
 msgid "unable to write tag file"
 msgstr "impossible d'écrire le fichier d'étiquettes"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "mauvais type d'objet."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Le message pour l'étiquette a été laissé dans %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "afficher les noms des étiquettes"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "affiche <n> lignes de chaque message d'étiquette"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "supprimer des étiquettes"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "vérifier des étiquettes"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Options de création de l'étiquette"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "étiquette annotée, nécessite un message"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "message pour l'étiquette"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "forcer l'édition du message d'étiquetage"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "étiquette annotée et signée avec GPG"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "utiliser une autre clé pour signer l'étiquette"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "créer un reflog"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "afficher la liste des étiquettes sous forme de colonnes"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "afficher seulement les étiquettes qui contiennent la validation"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "afficher seulement les étiquettes qui sont fusionnées"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column et -n sont incompatibles"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "l'option -n est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "l'option --contains est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "l'option --contains est autorisée seulement en mode liste"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "l'option --points-at est autorisée seulement en mode liste"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 "les options --merged et --no-merged ne sont autorisées qu'en mode liste"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "une seule option -F ou -m est autorisée."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "trop de paramètres"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "Dépaquetage des objets"
 
@@ -14512,8 +14806,8 @@ msgid "print tag contents"
 msgstr "afficher le contenu de l'étiquette"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<options>] <chemin> [<branche>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<options>] <chemin> [<commit>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14524,30 +14818,38 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<options>] <chemin>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<options>] <arbre-de-travail>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Suppression de worktrees/%s : répertoire invalide"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -14556,109 +14858,186 @@ msgstr ""
 "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
 "attendus, %<PRIuMAX> octets lus)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
 "inexistant"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail éliminés"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Préparation de %s (identifiant %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extraire la <branche> même si elle est déjà extraite dans une autre copie de "
 "travail"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "régler le mode de suivi (voir git-branch(1))"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "essayer de nommer la nouvelle branche comme la branche amont"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "raison du verrouillage"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' n'est pas une copie de travail"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 "La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "les arbres de travail contenant des sous-modules ne peuvent pas être déplacés ou supprimés"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' est un arbre de travail principal"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "impossible de trouver le nom de la destination à partir de '%s'"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "la cible '%s' existe déjà"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "impossible de déplacer un arbre de travail verrouillé, raison du verrouillage : %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "impossible de déplacer un arbre de travail verrouillé"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "échec au déplacement de '%s' vers '%s'"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "échec du lancement de 'git status' sur '%s'"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s' est sale, utilisez --force pour le supprimer"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "impossible de lancer 'git status' sur '%s', code %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "échec de la suppression de '%s'"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "forcer la suppression même si l'arbre de travail est sale"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "impossible de supprimer un arbre de travail verrouillé, raison du verrouillage : %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "impossible de supprimer un arbre de travail verrouillé"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "la validation a échoué, impossible de supprimer l'arbre de travail : %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
@@ -14675,25 +15054,25 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
 msgid "only useful for debugging"
 msgstr "seulement utile pour le débogage"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<options>] <répertoire>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "quitter après un unique échange requête/réponse"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "Sortir immédiatement après l'annonce initiale des références"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
 "Git"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrompre le transfert après <n> secondes d'inactivité"
 
@@ -14714,6 +15093,20 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "afficher les messages de debug sur stderr"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
+"           [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
+"           <commande> [<args>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14724,21 +15117,66 @@ msgstr ""
 "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
 "pour en lire plus à propos d'une commande spécifique ou d'un concept."
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "aucun répertoire fourni pour --git-dir\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "aucun espace de nom fournit pour --namespace\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "aucun répertoire fourni pour --work-tree\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "aucun préfixe fourni pour --super-prefix\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c requiert une chaîne de configuration\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "aucun répertoire fourni pour -C\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "option inconnue : %s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "échec au lancement de la commande '%s' : %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14749,16 +15187,16 @@ msgstr ""
 "      demandé : %s\n"
 "  redirection : %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirection vers %s"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "filtrage d'objet"
 
@@ -14870,23 +15308,23 @@ msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "date-d'expiration"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "sans action (rétrocompatibilité)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "être plus verbeux"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "être plus silencieux"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
 
@@ -15124,7 +15562,7 @@ msgstr "Essai de fusion simple avec $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "La fusion simple a échoué, essai avec la fusion automatique."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15138,43 +15576,43 @@ msgstr ""
 "arrêter\n"
 "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Impossible de revenir à $head_name"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "Autoremisage appliqué."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Impossible de stocker $stash_sha1"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusé de rebaser."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
 "interactif."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -15182,7 +15620,7 @@ msgstr ""
 "Vous devez éditer tous les conflits de fusion et\n"
 "les marquer comme résolus avec git add"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -15204,76 +15642,76 @@ msgstr ""
 "chose\n"
 "d'important ici."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "invalide '$upstream_name' en amont"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name : il y a plus d'une base de fusion"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name : il n'y a pas de base de fusion"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Ne pointe pas sur une validation valide : $onto_name"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "fatal : pas de branche ou commit '$branch_name'"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "Autoremisage impossible"
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Autoremisage créé : $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD est à jour."
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La branche courante $branch_name est à jour."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD est à jour, rebasage forcé."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "La branche courante $branch_name est à jour, rebasage forcé."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Changements de $mb sur $onto :"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
 "dessus..."
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
@@ -15342,88 +15780,88 @@ msgstr "Impossible de sauver l'état courant"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "option inconnue : $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "Aucune entrée de remisage trouvée."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Trop de révisions spécifiées : $REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference n'est pas une référence valide"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' n'est pas une validation de type remisage"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' n'est pas une référence de remisage"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "impossible de rafraîchir l'index"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Impossible d'appliquer un remisage en cours de fusion"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflits dans l'index. Essayez sans --index."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "Impossible de sauvegarder l'arbre d'index"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 "Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "Impossible de désindexer les fichiers modifiés"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} supprimé ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Impossible de supprimer l'élément de stash"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Pour les restaurer tapez \"git stash apply\")"
 
@@ -15523,73 +15961,19 @@ msgstr "Entrée dans '$displaypath'"
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "un spécificateur de chemin et --all sont incompatibles"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"La copie de travail du sous-module '$displaypath' contient un répertoire ."
-"git\n"
-"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
-"historique)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"La copie de travail du sous-module '$displaypath' contient des modifications "
-"locales ; utilisez '-f' pour les annuler"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Répertoire '$displaypath' nettoyé"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
-"'$displaypath'"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossible de trouver la révision courante dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15598,12 +15982,12 @@ msgstr ""
 "Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
 "chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15612,87 +15996,82 @@ msgstr ""
 "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
 "$sha1. La récupération directe de ce commit a échoué."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode $mod_dst inattendu"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_src"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_dst"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Attention : $display_name ne contient pas les validations $sha1_src et "
 "$sha1_dst"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15746,7 +16125,7 @@ msgstr ""
 "\n"
 "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15765,83 +16144,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1 n'est pas un commit qui peut être picorer"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nom de commit invalide : $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avance rapide sur $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "Avance rapide impossible sur $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Impossible de déplacer HEAD sur $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Refus d'écraser un commit de fusion: $sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Erreur lors de la réapplication de la fusion $sha1"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Impossible de picorer $sha1"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Ceci est le ${n}ième message de validation :"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Le message de validation ${n} sera ignoré :"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Ceci est la combinaison de $count commit."
 msgstr[1] "Ceci est la combinaison de $count commits."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Impossible d'écrire $fixup_msg"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "Ceci est la combinaison de 2 commits."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Impossible d'appliquer $sha1... $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15858,31 +16237,31 @@ msgstr ""
 "le\n"
 "problème avant de pouvoir reformuler le message du commit."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Arrêté à $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "'$squash_style' impossible avec le commit précédent"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Exécution : $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "L'exécution a échoué : $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "et a mis à jour l'index ou la copie de travail"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15893,7 +16272,7 @@ msgstr ""
 "git rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15908,29 +16287,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Commande inconnue : $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Rebasage et mise à jour de $head_name avec succès."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "Impossible de détacher HEAD"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15961,12 +16340,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15974,11 +16353,11 @@ msgstr ""
 "Vous avez des modifications non validées dans votre copie de travail.\n"
 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15993,44 +16372,44 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "Impossible de lancer l'éditeur"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Impossible d'extraire $switch_to"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "Pas de HEAD ?"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Impossible de créer un répertoire temporaire $state_dir"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "Impossible de marquer comme interactif"
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "Impossible d'initialiser les commits réécrits"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "Impossible de générer la liste à-faire"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
 msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -16040,7 +16419,7 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Veuillez noter que les commits vides sont en commentaire"
 
@@ -16186,7 +16565,7 @@ msgstr "Ajouter un fichier non-suivi"
 msgid "No untracked files.\n"
 msgstr "Aucun Fichier non suivi.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -16194,7 +16573,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme indexée."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -16202,7 +16581,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme remisée."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -16210,7 +16589,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme desindexée."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -16218,7 +16597,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme appliquée."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -16226,17 +16605,17 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme éliminée."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -16250,7 +16629,7 @@ msgstr ""
 "Les lignes commençant par %s seront éliminées.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -16260,7 +16639,7 @@ msgstr ""
 "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
 "alors l'édition sera abandonnée et la section conservée.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
@@ -16271,14 +16650,14 @@ msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
 "l'élimine !) [y|n] ? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -16292,7 +16671,7 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -16306,7 +16685,7 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -16320,7 +16699,7 @@ msgstr ""
 "a - désindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas désindexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -16334,7 +16713,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -16348,7 +16727,7 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16362,7 +16741,7 @@ msgstr ""
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas éliminer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16376,7 +16755,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16398,203 +16777,211 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "Les appliquer quand même à l'arbre de travail ? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "Rien n'a été appliqué.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "fichier non-fusionné ignoré : %s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Seuls des fichiers binaires ont changé.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "Aucune modification.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Mise à jour par patch"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Indexer le changement de mode [y,n,q,a,d,/%s,?] ? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Indexer la suppression [y,n,q,a,d,/%s,?] ? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Indexer cette section [y,n,q,a,d,/%s,?] ? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Remiser le changement de mode [y,n,q,a,d,/%s,?] ? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Remiser la suppression [y,n,q,a,d,/%s,?] ? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Remiser cette section [y,n,q,a,d,/%s,?] ? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Désindexer le changement de mode [y,n,q,a,d,/%s,?] ? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Désindexer la suppression [y,n,q,a,d,/%s,?] ? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Désindexer cette section [y,n,q,a,d,/%s,?] ? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d,/%s,?] ? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Appliquer la suppression à l'index [y,n,q,a,d,/%s,?] ? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Appliquer cette section à l'index [y,n,q,a,d,/%s,?] ? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d,/%s,?] ? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d,/%s,?] ? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d,/%s,?] ? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d,/%s,?] ? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d,/%s,?] ? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"
-"d,/%s,?] ? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d,/"
-"%s,?] ? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "Aucune autre section à atteindre\n"
+
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "aller à quelle section (<ret> pour voir plus) ? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "aller à quelle section ? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nombre invalide : '%s'\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Désolé, %d seule section disponible.\n"
 msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "aucune autre section à rechercher\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "rechercher la regex ? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regex de recherche malformée %s : %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "Aucune section ne correspond au motif donné\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "Pas de section précédente\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "Pas de section suivante\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Désolé, impossible de découper cette section\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Découpée en %d section.\n"
 msgstr[1] "Découpée en %d sections.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Désolé, impossible d'éditer cette section\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Réviser la différence"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16612,88 +16999,94 @@ msgstr ""
 "diff          - visualiser les diff entre HEAD et l'index\n"
 "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "-- manquant"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "mode de --patch inconnu : %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument invalide %s, -- attendu"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'éditeur est sorti en erreur, abandon total"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contient une version intermédiaire du courriel que vous composiez.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contient le courriel composé.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases est incompatible avec d'autres options\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de commande ou des options de configuration)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Champ de --suppress-cc inconnu : '%s'\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paramètre de --confirm inconnu : '%s'\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attention : `:include:` n'est pas supporté : %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attention : ligne sendmail non reconnue : %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16708,12 +17101,12 @@ msgstr ""
 "    * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
 "    * en fournissant l'option --format-patch pour une plage.\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Échec à l'ouverture du répertoire %s : %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16722,7 +17115,7 @@ msgstr ""
 "fatal : %s : %s\n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16732,17 +17125,17 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ligne de sujet non trouvée dans %s ?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16756,32 +17149,27 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Échec à l'ouverture de %s.final : %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr ""
-"Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Échec à l'ouverture de %s.final : %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16789,11 +17177,11 @@ msgstr ""
 "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16806,22 +17194,22 @@ msgstr ""
 "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
 "vraiment envoyer.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal : l'alias '%s' se développe en lui-même\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
 "a) ? "
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -16829,16 +17217,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "le chemin vers la CA \"%s\" n'existe pas"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16865,134 +17253,155 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Le serveur ne supporte pas STARTTLS ! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "echec de STARTTLS ! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
 "debug."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "échec de l'envoi de %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) échec de la fermeture du pipe vers '%s'"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "impossible d'ouvrir %s :%s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "expression de filtre invalide : '%s'"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "La copie du patch qui a échoué se trouve dans : %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "un spécificateur de chemin et --all sont incompatibles"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
+#~ "'$displaypath'"
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr ""
+#~ "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
+
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
 #~ "please use . instead if you meant to match all paths"
@@ -17376,9 +17785,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ msgid "Unprocessed path??? %s"
 #~ msgstr "Chemin non traité ??? %s"
 
-#~ msgid "Error wrapping up %s"
-#~ msgstr "Erreur à l'emballage de %s"
-
 #~ msgid "Cannot %s during a %s"
 #~ msgstr "Impossible de %s pendant un %s"
 
diff --git a/po/git.pot b/po/git.pot
index e36d187..ab5d179 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\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"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
@@ -438,7 +438,7 @@ msgstr ""
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
@@ -514,7 +514,7 @@ msgstr[1] ""
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -572,11 +572,11 @@ msgstr[1] ""
 msgid "Unable to write new index file"
 msgstr ""
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr ""
@@ -589,7 +589,7 @@ msgstr ""
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr ""
 
@@ -629,75 +629,75 @@ msgstr ""
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr ""
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr ""
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr ""
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr ""
 
@@ -731,7 +731,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr ""
 
@@ -775,8 +775,8 @@ msgstr ""
 msgid "list supported archive formats"
 msgstr ""
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr ""
 
@@ -825,43 +825,43 @@ msgid ""
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr ""
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr ""
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -869,7 +869,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -882,38 +882,38 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr ""
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr ""
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -923,43 +923,43 @@ msgstr[1] ""
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr ""
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr ""
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr ""
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr ""
@@ -1098,76 +1098,75 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr ""
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr ""
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr ""
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr ""
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr ""
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr ""
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr ""
@@ -1177,7 +1176,7 @@ msgstr ""
 msgid "%s %s is not a commit!"
 msgstr ""
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1280,65 +1279,65 @@ msgstr ""
 msgid "bad zlib compression level %d"
 msgstr ""
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
@@ -1355,46 +1354,46 @@ msgid ""
 "and the repository exists."
 msgstr ""
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr ""
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr ""
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
+msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr ""
-
 #: date.c:116
 msgid "in the future"
 msgstr ""
@@ -1505,59 +1504,68 @@ msgid ""
 "%s"
 msgstr ""
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
@@ -1576,184 +1584,192 @@ msgstr ""
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr ""
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr ""
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr ""
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr ""
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr ""
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr ""
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr ""
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr ""
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr ""
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr ""
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr ""
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr ""
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr ""
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr ""
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr ""
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr ""
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr ""
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr ""
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
@@ -1776,17 +1792,18 @@ msgstr ""
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr ""
@@ -1907,18 +1924,17 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
 msgstr ""
 
 #: lockfile.c:151
@@ -1942,8 +1958,8 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr ""
 
@@ -1960,239 +1976,239 @@ msgstr ""
 msgid "error building trees"
 msgstr ""
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ""
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr ""
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr ""
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr ""
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr ""
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr ""
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr ""
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr ""
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr ""
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr ""
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr ""
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr ""
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr ""
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr ""
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr ""
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr ""
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr ""
 
@@ -2209,16 +2225,16 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr ""
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
@@ -2227,7 +2243,7 @@ msgstr ""
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr ""
@@ -2237,25 +2253,25 @@ msgstr ""
 msgid "unable to parse object: %s"
 msgstr ""
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr ""
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -2263,17 +2279,17 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr ""
 
@@ -2362,36 +2378,36 @@ msgstr ""
 msgid "unable to parse --pretty format"
 msgstr ""
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
@@ -2410,18 +2426,18 @@ msgstr ""
 msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr ""
 
@@ -2615,128 +2631,138 @@ msgstr ""
 msgid "(no branch)"
 msgstr ""
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr ""
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr ""
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr ""
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2744,11 +2770,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2759,28 +2785,28 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr ""
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -2788,104 +2814,113 @@ msgid ""
 msgstr ""
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr ""
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr ""
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr ""
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr ""
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:267
 msgid "revert"
 msgstr ""
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr ""
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr ""
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr ""
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr ""
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr ""
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr ""
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
+msgid "failed to finalize '%s'"
 msgstr ""
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr ""
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr ""
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr ""
@@ -2893,20 +2928,20 @@ msgstr ""
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr ""
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr ""
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -2923,17 +2958,101 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr ""
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr ""
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr ""
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr ""
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr ""
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr ""
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr ""
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -2941,7 +3060,7 @@ msgid ""
 "\t%.*s"
 msgstr ""
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -2949,240 +3068,244 @@ msgid ""
 "\t%.*s"
 msgstr ""
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr ""
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr ""
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr ""
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr ""
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr ""
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr ""
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr ""
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr ""
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr ""
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr ""
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3192,11 +3315,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3207,17 +3330,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3225,108 +3348,103 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr ""
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr ""
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr ""
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr ""
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr ""
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3337,7 +3455,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3345,21 +3463,26 @@ msgid ""
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr ""
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr ""
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3375,6 +3498,11 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3383,68 +3511,138 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr ""
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ""
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr ""
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr ""
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr ""
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr ""
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr ""
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr ""
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr ""
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr ""
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1052
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
+msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr ""
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
@@ -3509,7 +3707,7 @@ msgstr ""
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
@@ -3533,24 +3731,24 @@ msgstr ""
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr ""
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3558,20 +3756,20 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr ""
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr ""
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
@@ -3649,14 +3847,14 @@ msgstr ""
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3672,11 +3870,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr ""
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr ""
@@ -3697,98 +3895,98 @@ msgstr ""
 msgid "too-short tree file"
 msgstr ""
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3796,7 +3994,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3804,47 +4002,47 @@ msgid ""
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -3852,7 +4050,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -3860,19 +4058,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr ""
 
@@ -3905,18 +4103,43 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr ""
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr ""
@@ -3930,374 +4153,374 @@ msgstr ""
 msgid "unable to get current working directory"
 msgstr ""
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr ""
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr ""
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr ""
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr ""
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr ""
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr ""
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr ""
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr ""
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr ""
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr ""
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr ""
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr ""
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr ""
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr ""
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr ""
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr ""
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr ""
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr ""
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr ""
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr ""
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr ""
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr ""
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr ""
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr ""
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr ""
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr ""
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4305,93 +4528,97 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr ""
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr ""
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
@@ -4405,7 +4632,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr ""
 
@@ -4453,7 +4680,7 @@ msgstr ""
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4463,7 +4690,7 @@ msgstr ""
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr ""
 
@@ -4574,10 +4801,10 @@ msgstr ""
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr ""
 
@@ -4629,93 +4856,84 @@ msgstr ""
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr ""
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr ""
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr ""
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr ""
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr ""
 
@@ -4723,42 +4941,41 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -4766,171 +4983,179 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr ""
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr ""
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr ""
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr ""
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr ""
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr ""
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr ""
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
@@ -4952,7 +5177,7 @@ msgid "git archive: Remote with no URL"
 msgstr ""
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 
 #: builtin/archive.c:61
@@ -5039,107 +5264,107 @@ msgstr ""
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr ""
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr ""
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr ""
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr ""
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr ""
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr ""
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr ""
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
@@ -5151,18 +5376,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr ""
 
@@ -5441,17 +5666,17 @@ msgstr ""
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr ""
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr ""
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr ""
 
@@ -5459,16 +5684,16 @@ msgstr ""
 msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
@@ -5562,75 +5787,75 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr ""
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr ""
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr ""
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr ""
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr ""
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr ""
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
@@ -5650,7 +5875,7 @@ msgstr ""
 msgid "use .gitattributes only from the index"
 msgstr ""
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr ""
 
@@ -5658,7 +5883,7 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -5670,27 +5895,27 @@ msgstr ""
 msgid "ignore index when checking"
 msgstr ""
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr ""
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 
@@ -5748,9 +5973,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr ""
 
@@ -5795,80 +6020,80 @@ msgstr ""
 msgid "path '%s': cannot merge"
 msgstr ""
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -5883,7 +6108,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5900,160 +6125,160 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr ""
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr ""
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr ""
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr ""
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6137,7 +6362,7 @@ msgstr ""
 msgid "Remove %s [y/N]? "
 msgstr ""
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr ""
@@ -6153,11 +6378,11 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr ""
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr ""
 
@@ -6187,8 +6412,8 @@ msgstr ""
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6222,315 +6447,319 @@ msgid ""
 "refusing to clean"
 msgstr ""
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr ""
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr ""
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr ""
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr ""
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr ""
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr ""
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr ""
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr ""
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr ""
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr ""
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr ""
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr ""
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr ""
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr ""
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr ""
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr ""
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr ""
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr ""
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr ""
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr ""
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr ""
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr ""
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr ""
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr ""
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr ""
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr ""
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr ""
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -6566,51 +6795,22 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -6619,11 +6819,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -6633,98 +6833,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr ""
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr ""
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr ""
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr ""
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr ""
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr ""
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr ""
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr ""
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr ""
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr ""
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr ""
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -6734,7 +6934,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -6744,14 +6944,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -6759,357 +6959,337 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr ""
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr ""
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr ""
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr ""
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr ""
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr ""
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr ""
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr ""
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr ""
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr ""
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr ""
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr ""
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr ""
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr ""
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr ""
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr ""
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr ""
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr ""
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7325,131 +7505,131 @@ msgstr ""
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr ""
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr ""
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr ""
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr ""
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr ""
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr ""
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr ""
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr ""
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr ""
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr ""
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr ""
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 
@@ -7632,272 +7812,281 @@ msgstr ""
 msgid "anonymize output"
 msgstr ""
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr ""
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr ""
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr ""
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr ""
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr ""
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr ""
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr ""
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr ""
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr ""
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr ""
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr ""
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr ""
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr ""
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr ""
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr ""
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr ""
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr ""
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr ""
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr ""
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr ""
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr ""
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr ""
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr ""
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr ""
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr ""
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr ""
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr ""
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr ""
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr ""
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr ""
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr ""
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr ""
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
@@ -7962,7 +8151,7 @@ msgstr ""
 msgid "show only <n> matched refs"
 msgstr ""
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr ""
 
@@ -7986,63 +8175,63 @@ msgstr ""
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr ""
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr ""
 
@@ -8082,37 +8271,37 @@ msgstr ""
 msgid "enable auto-gc mode"
 msgstr ""
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8121,12 +8310,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
@@ -8135,280 +8324,280 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr ""
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr ""
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr ""
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr ""
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr ""
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr ""
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr ""
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr ""
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr ""
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr ""
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr ""
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr ""
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr ""
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr ""
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr ""
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr ""
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr ""
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr ""
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr ""
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr ""
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr ""
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr ""
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr ""
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr ""
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr ""
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr ""
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr ""
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr ""
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr ""
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr ""
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr ""
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr ""
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr ""
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr ""
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr ""
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr ""
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr ""
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr ""
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr ""
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr ""
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr ""
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr ""
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr ""
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr ""
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr ""
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr ""
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr ""
 
@@ -8536,152 +8725,152 @@ msgstr ""
 msgid "usage: %s%s"
 msgstr ""
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr ""
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr ""
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr ""
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr ""
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr ""
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr ""
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr ""
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr ""
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr ""
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr ""
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr ""
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr ""
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr ""
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr ""
 
@@ -8751,77 +8940,81 @@ msgstr ""
 msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
+msgid "cannot write %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
+msgid "cannot close written %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr ""
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
 msgstr ""
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr ""
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr ""
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr ""
 
@@ -8999,346 +9192,346 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr ""
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr ""
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr ""
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr ""
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr ""
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr ""
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr ""
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr ""
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr ""
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr ""
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr ""
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr ""
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr ""
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr ""
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
 "Or you could specify base commit by --base=<base-commit-id> manually."
 msgstr ""
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr ""
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr ""
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr ""
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr ""
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr ""
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr ""
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9487,7 +9680,7 @@ msgstr ""
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr ""
 
@@ -9532,180 +9725,180 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr ""
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr ""
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr ""
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr ""
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr ""
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9715,185 +9908,185 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr ""
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr ""
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10045,72 +10238,72 @@ msgstr ""
 msgid "force move/rename even if target exists"
 msgstr ""
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr ""
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr ""
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr ""
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr ""
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr ""
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr ""
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr ""
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr ""
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr ""
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr ""
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
@@ -10295,12 +10488,12 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
@@ -10534,7 +10727,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr ""
 
@@ -10565,182 +10758,186 @@ msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr ""
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr ""
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr ""
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr ""
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr ""
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr ""
 
@@ -10768,15 +10965,19 @@ msgstr ""
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr ""
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr ""
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
@@ -10868,7 +11069,7 @@ msgstr ""
 msgid "<remote>"
 msgstr ""
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
@@ -10889,27 +11090,27 @@ msgid ""
 "from the remote, but no such ref was fetched."
 msgstr ""
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr ""
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr ""
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -10917,7 +11118,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -10928,15 +11129,15 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -11262,39 +11463,43 @@ msgstr ""
 msgid "keep empty commits"
 msgstr ""
 
-#: builtin/rebase--helper.c:25
-msgid "continue rebase"
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
 msgstr ""
 
 #: builtin/rebase--helper.c:27
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr ""
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr ""
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr ""
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr ""
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr ""
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr ""
 
@@ -11302,7 +11507,7 @@ msgstr ""
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11319,7 +11524,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11331,15 +11536,15 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr ""
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr ""
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
@@ -11847,87 +12052,87 @@ msgid ""
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr ""
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr ""
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr ""
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr ""
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr ""
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr ""
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr ""
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr ""
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr ""
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr ""
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""
@@ -12008,11 +12213,11 @@ msgstr ""
 msgid "replace the ref if it exists"
 msgstr ""
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr ""
 
@@ -12070,99 +12275,103 @@ msgstr ""
 msgid "Failed to find tree of %s."
 msgstr ""
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr ""
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr ""
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr ""
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr ""
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr ""
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr ""
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr ""
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr ""
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr ""
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr ""
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr ""
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr ""
 
@@ -12260,10 +12469,6 @@ msgstr ""
 msgid "preserve initially empty commits"
 msgstr ""
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr ""
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr ""
@@ -12589,243 +12794,330 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr ""
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr ""
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr ""
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr ""
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr ""
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
@@ -12916,139 +13208,143 @@ msgstr ""
 msgid "unable to write tag file"
 msgstr ""
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr ""
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr ""
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr ""
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr ""
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr ""
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr ""
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr ""
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr ""
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr ""
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr ""
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr ""
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr ""
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr ""
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr ""
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr ""
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr ""
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr ""
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr ""
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr ""
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr ""
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr ""
 
@@ -13365,7 +13661,7 @@ msgid "print tag contents"
 msgstr ""
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 
 #: builtin/worktree.c:18
@@ -13377,132 +13673,217 @@ msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
 #: builtin/worktree.c:20
-msgid "git worktree prune [<options>]"
+msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 
 #: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr ""
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr ""
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr ""
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr ""
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr ""
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr ""
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr ""
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr ""
@@ -13519,23 +13900,23 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr ""
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr ""
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 
@@ -13552,6 +13933,15 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr ""
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -13559,20 +13949,65 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr ""
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -13580,16 +14015,16 @@ msgid ""
 "   redirect: %s"
 msgstr ""
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr ""
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr ""
 
@@ -13697,23 +14132,23 @@ msgstr ""
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr ""
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr ""
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr ""
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
@@ -13926,7 +14361,7 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -13935,47 +14370,47 @@ msgid ""
 "abort\"."
 msgstr ""
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr ""
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr ""
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr ""
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -13988,74 +14423,74 @@ msgid ""
 "valuable there."
 msgstr ""
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr ""
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr ""
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
@@ -14123,86 +14558,86 @@ msgstr ""
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr ""
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr ""
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr ""
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr ""
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr ""
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr ""
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
@@ -14289,153 +14724,104 @@ msgstr ""
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr ""
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr ""
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -14473,7 +14859,7 @@ msgid ""
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -14485,83 +14871,83 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr ""
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr ""
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14571,31 +14957,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr ""
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr ""
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr ""
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -14603,7 +14989,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -14613,29 +14999,29 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr ""
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -14653,21 +15039,21 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr ""
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14676,51 +15062,51 @@ msgid ""
 "\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr ""
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr ""
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr ""
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr ""
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr ""
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr ""
 
@@ -14856,46 +15242,46 @@ msgstr ""
 msgid "No untracked files.\n"
 msgstr ""
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -14905,14 +15291,14 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
@@ -14923,12 +15309,12 @@ msgstr ""
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -14937,7 +15323,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -14946,7 +15332,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -14955,7 +15341,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -14964,7 +15350,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -14973,7 +15359,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -14982,7 +15368,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -14991,7 +15377,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15004,195 +15390,211 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr ""
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr ""
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr ""
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr ""
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr ""
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr ""
+
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr ""
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr ""
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -15203,84 +15605,90 @@ msgid ""
 "changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr ""
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15290,36 +15698,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr ""
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15328,41 +15736,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
 msgstr ""
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15371,20 +15775,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
@@ -15392,16 +15796,16 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -15418,128 +15822,128 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr ""
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr ""
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr ""
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr ""
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr ""
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr ""
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 9c0ffa5..f833709 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -45,6 +45,7 @@
 #  | octopus      | 옥토�스 (병합 전략)                         |
 #  | pack         | 묶�                                         |
 #  | pathspec     | 경로명세                                     |
+#  | promisor     | 프�미서                                     |
 #  | rebase       | 리베�스                                     |
 #  | ref          | 레�런스                                     |
 #  | repo         | 저장소                                       |
@@ -54,6 +55,7 @@
 #  | subcommand   | 하위 명령                                    |
 #  | submodule    | 하위 모듈                                    |
 #  | tree-ish     | 트리-따위                                    |
+#  | work tree    | 작업 ��                                    |
 #  | working tree | 작업 ��                                    |
 #  +--------------+----------------------------------------------+
 #
@@ -61,8 +63,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-08 10:09+0900\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-28 23:28+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
 "ko>\n"
@@ -71,7 +73,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.5\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: advice.c:62
 #, c-format
@@ -115,7 +117,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "해결하지 못한 충� 때문� �납니다."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "병합 작업� 다 마치지 않았습니다 (MERGE_HEAD 파�� 있습니다)."
 
@@ -516,7 +518,7 @@ msgstr "%s� 대한 모드 변경�지만, 현재 HEAD� 없습니다"
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 정보가 없거나 쓸 수 없습니다 (%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "경로 '%s'� 대해 make_cache_entry 실패"
@@ -591,7 +593,7 @@ msgstr[0] "%%s 패치를 (%d개 거부) �용..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncating .rej 파� �름� '%.*s.rej'(으)로 �름"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "%s�(를) 열 수 없습니다"
@@ -646,11 +648,11 @@ msgstr[0] "공백 오류를 바로잡� 뒤� %d번 줄 �용."
 msgid "Unable to write new index file"
 msgstr "새 ��스 파�� 쓸 수 없습니다"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "경로"
@@ -663,7 +665,7 @@ msgstr "주어진 경로� 해당하는 변경 사항� �용하지 않습니
 msgid "apply changes matching the given path"
 msgstr "주어진 경로� 해당하는 변경 사항� �용합니다"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "개수"
 
@@ -703,75 +705,75 @@ msgstr "작업 ��를 바꾸지 않고 패치를 �용합니다"
 msgid "accept a patch that touches outside the working area"
 msgstr "작업 �역 밖� 파�� 바꾸는 패치를 허용합니다"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "그리고 패치� �용합니다 (--stat/--summary/--check 옵션과 같� 사용)"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "패치를 �용하지 않으면 3-방향 병합� 시�합니다"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr "내장 ��스 정보를 사용해 임시 ��스를 만듭니다"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "경로를 NUL 문�로 구분합니다"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "최소한 <n>줄� 컨�스트와 �치하는지 확�합니다"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "�작"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "공백 오류가 있는 추가�거나 수정� 줄� 찾습니다"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "컨�스트를 찾� 때 공백 변경 사항� 무시합니다"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "패치를 반대 순서로 �용합니다"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "최소한� 컨�스트 한 줄� 없� �용합니다"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "거부� 패치 부분� 대��는 *.rej 파�� 남겨둡니다"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "패치 부분� 겹�� 허용합니다"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "�세히 표시"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "파� �� 줄바꿈� 빠졌�� 잘못 검색한 경우� 무시합니다"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "패치 부분� 헤�� 줄 수를 신용하지 않습니다"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "최�위"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "모든 파� �름� <최�위>를 앞� 붙입니다"
 
@@ -807,7 +809,7 @@ msgstr "형�"
 msgid "archive format"
 msgstr "압축 형�"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "접�어"
 
@@ -815,11 +817,11 @@ msgstr "접�어"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "아카�브� � 경로 �름� 앞� 지정한 경로를 붙입니다"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "파�"
 
@@ -851,8 +853,8 @@ msgstr "� 작게 압축"
 msgid "list supported archive formats"
 msgstr "지�하는 압축 형�� 목�� 표시합니다"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "저장소"
 
@@ -903,22 +905,22 @@ msgstr ""
 "git attributes�서 반대 패턴� 무시�니다.\n"
 "앞� �낌표를 쓰려면 '\\!'를 사용하십시오."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "'%s' 파� 안� 잘못� 따옴표가 붙� 내용: %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "� �� �등분할 수 없습니다!\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "올바른 커밋 �름� 아닙니다 (%s)"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -927,7 +929,7 @@ msgstr ""
 "%s 병합 베�스가 비정�입니다.\n"
 "버그가 %s � [%s] 사��서 고�졌다는 뜻입니다.\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -936,7 +938,7 @@ msgstr ""
 "%s 병합 베�스가 새롭습니다.\n"
 "�성� %s � [%s] 사��서 변경�었습니다.\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -945,7 +947,7 @@ msgstr ""
 "%s 병합 베�스가 %s입니다.\n"
 "처� '%s' 커밋� %s � [%s] 사��는 뜻입니다.\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -956,7 +958,7 @@ msgstr ""
 "git bisect 명령� � 경우�는 올바르게 �작하지 않습니다.\n"
 "%s � %s 리비전� 잘못 쓴 것 아닙니까?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -972,31 +974,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "�등분: 병합 베�스를 시험해야 합니다\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "하나� %s 리비전� 필요합니다"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "'%s' 파�� 만들 수 없습니다"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "'%s' 파�� �� 수 없습니다"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "�등분 레�런스 �기� 실패했습니다"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s�(는) %s � %s 모�� 해당�니다\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1005,7 +1007,7 @@ msgstr ""
 "시험 가능한 커밋� 없습니다.\n"
 "잘못� 경로 파�미터로 시작하지 않았습니까?\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1014,45 +1016,45 @@ msgstr[0] "(대략 %d 단계)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "�등분: %2$s 뒤� 시험할 리비전� %1$d개 남았습니다\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents � --reverse 옵션� 호환�지 않습니다."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "--contents 옵션� 마지막 오브�트 �름� 사용할 수 없습니다"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse � --first-parent 옵션� 같� 쓰면 최근 커밋� 지정해야 합니다"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "리비전 walk 준비가 실패했습니다"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse � --first-parent 옵션� 같� 쓰면 최초-�위 체�과 범위가 필요합니"
 "다"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "%s 경로가 %s 안� 없습니다"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "%s 경로� 대해 %s 블롭� �� 수 없�"
@@ -1211,74 +1213,73 @@ msgstr "'%s' 파�� 버전2 번들 파�로 보�지 않습니다"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "��할 수 없는 헤�: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "'%s'�(를) 열 수 없습니다"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "저장소� 필수�� 다� 커밋� 없습니다:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "번들� 다� 레�런스 %d개가 있습니다:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "번들� 전체 커밋 내역� 기�합니다."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "번들� 다� 레�런스 %d개가 필요합니다:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "pack-objects 명령� 실행할 수 없습니다"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "pack-objects 명령� 죽었습니다"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "rev-list 명령� 죽었습니다"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "rev-list 옵션�서 '%s' 레�런스가 제외�었습니다"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "알 수 없는 ��: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "빈 번들� 만들지 않습니다."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "'%s'�(를) 만들 수 없습니다"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "index-pack 명령� 죽었습니다"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "잘못� 색 값: %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "parse %s�(를) 파싱할 수 없습니다"
@@ -1288,7 +1289,7 @@ msgstr "parse %s�(를) 파싱할 수 없습니다"
 msgid "%s %s is not a commit!"
 msgstr "%s %s, 커밋� 아닙니다"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1394,65 +1395,65 @@ msgstr "'%s' 값� '%s'� 대해 올바른 시� 값� 아닙니다"
 msgid "bad zlib compression level %d"
 msgstr "%d번� 올바른 zlib 압축 단계가 아닙니다"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "오브�트 �성 모드가 올바르지 않습니다: %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "잘못 묶� 압축 단계 %d"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "명령행 설정� 파싱할 수 없습니다"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "설정 파�� �는 중 알 수 없는 오류가 �겼습니다"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "잘못� %s: '%s'"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "알 수 없는 core.untrackedCache 값 '%s'; 기본값으로 'keep' 사용"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 값('%d')� 0�서 100 사�여야 합니다"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "명령행 설정�서 '%s'�(를) 설정할 수 없습니다"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "'%2$s' 파�� %3$d번 줄 '%1$s' 설정 변수가 잘못�었습니다"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s�(는) 여러 개 값� 있습니다"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "%s� 대해 fstat 실패"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "'%s'�(를) '%s'(으)로 설정할 수 없습니다"
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "'%s' 설정� 지울 수 없습니다"
@@ -1473,24 +1474,29 @@ msgstr ""
 "올바른 접근 권한� 있는지, 그리고 저장소가 있는지\n"
 "확�하십시오."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "연결� 확�하는 중입니다"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "'git rev-list'를 실행할 수 없습니다"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "rev-list 쓰기� 실패했습니다"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "rev-list� 표준입력� 닫는� 실패했습니다"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "%s�서 CRLF는 LF로 바�니다."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1498,12 +1504,12 @@ msgstr ""
 "%s�서 CRLF는 LF로 바�니다.\n"
 "작업 디렉터리�서는 �래 줄 바꿈 형�� 유지합니다."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "%s�서 CRLF는 LF로 바�니다."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "%s�서 LF는 CRLF로 바�니다."
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1512,11 +1518,6 @@ msgstr ""
 "%s�서 LF는 CRLF로 바�니다.\n"
 "작업 디렉터리�서는 �래 줄 바꿈 형�� 유지합니다."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "%s�서 LF는 CRLF로 바�니다."
-
 #: date.c:116
 msgid "in the future"
 msgstr "미래�"
@@ -1622,21 +1623,25 @@ msgstr ""
 "'diff.submodule' 설정 변수� 오류:\n"
 "%s'"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "외부 diff 프로그램� 죽�, %s 위치�서 멈춤"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S, --find-object 옵션 중 하나만 쓸 수 있습니다"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 옵션�는 정확히 하나� 경로명세가 필요합니다"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1645,39 +1650,44 @@ msgstr ""
 "--dirstat/-X 옵션 파�미터를 파싱하는� 실패했습니다:\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "--submodule 옵션 파�미터 파싱� 실패했습니다: '%s'"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "파�� 너무 많아서 부정확한 �름 바꾸기 검색 기능� 건너�니다."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr "파�� 너무 많아서 수정한 경로� 복사본만 찾았습니다."
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령� 다시 시�해 보십시오."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "'%s' 디렉터리를 열 수 없습니다"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "커� �름과 정보를 가져오는� 실패했습니다"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr "� 시스템 �는 위치�서는 추��지 않는 �시를 사용하지 않습니다."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "%s� 필요한 디렉터리를 만들 수 없습니다"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 git 디렉터리를 옮겨올 수 없습니다"
@@ -1696,184 +1706,192 @@ msgstr "내용 필터�"
 msgid "could not stat file '%s'"
 msgstr "'%s' 파�� stat� 할 수 없습니다"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "URL 없는 리모트"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: 얕� 목�� 예�함"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK가 와야 하지만, 플러시 패킷� 받았습니다"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "리모트 오류: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'�(를) 받았습니다"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 옵션� multi_ack_detailed가 필요합니다"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "shallow 줄� 잘못�: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "unshallow 줄� 잘못�: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "오브�트가 없습니다: %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "오브�트� 오류: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "shallow가 없습니다: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow가 와야 하지만, %s�(를) 받았습니다"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "받�: %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "잘못� 커밋 %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "�기함"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "완료"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "받�: %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "%s 항목� 완료로 표시"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "�미 %s (%s) 있�"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: 사�드밴드 디멀티플렉서를 fork할 수 없습니다"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "프로토콜 오류: 잘못� 묶� 헤�"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: %s 명령� fork할 수 없습니다"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s 실패"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "사�드밴드 디멀티플렉서� 오류"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "서버�서 shallow ���언트를 지�하지 않습니다"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "서버�서 multi_ack_detailed를 지�합니다"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "서버�서 no-done� 지�합니다"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "서버�서 multi_ack를 지�합니다"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "서버�서 side-band-64k를 지�합니다"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "서버�서 side-band를 지�합니다"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "서버�서 allow-tip-sha1-in-want를 지�합니다"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "서버�서 allow-reachable-sha1-in-want를 지�합니다"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "서버�서 ofs-delta를 지�합니다"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "서버�서 필터를 지�합니다"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "서버 버전� %.*s입니다"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "서버�서 --shallow-signed 옵션� 지�하지 않습니다"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "서버�서 --shallow-exclude 옵션� 지�하지 않습니다"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "서버�서 --deepen 옵션� 지�하지 않습니다"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "공통 커밋 없�"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: 가져오기 실패."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "해당하는 리모트 헤드가 없습니다"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "그런 리모트가 레�런스가 없습니다: %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "서버�서 알려지지 않� %s 오브�트� 대한 요청� 허용하지 않습니다"
@@ -1896,17 +1914,18 @@ msgstr "분리� 서명� '%s'� 쓰는� 실패했습니다"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "log.graphColors� 잘못� 색� ('%.*s') 무시합니다"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': %s�(를) �� 수 없습니다"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "'%s'� 대해 stat()� 실패했습니다"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': �다가 잘림"
@@ -2042,19 +2061,18 @@ msgstr "빈 ì�´ë¦„ì�˜ ì‹ ì›� 정보는 (<%s>ì—� 대해) 허용하지 않습니ë‹
 msgid "name consists only of disallowed characters: %s"
 msgstr "�름� 허용하지 않는 문�로만 �루어져 있습니다: %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "시� 형�� 잘못�었습니다: %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "여러 개� 오브�트 필터 종류는 결합� 수 없습니다"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "여러 개� 필터 양�� 결합� 수 없습니다"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "잘못� 필터 양� '%s'"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "프�미서 리모트 저장소로부터 부분 복제를 할 수 없습니다"
 
 #: lockfile.c:151
 #, c-format
@@ -2084,8 +2102,8 @@ msgstr "'%s.lock'� 만들 수 없습니다: %s"
 msgid "failed to read the cache"
 msgstr "�시를 �는� 실패했습니다"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "새 ��스 파�� 쓸 수 없습니다"
 
@@ -2102,60 +2120,60 @@ msgstr "'%s' 경로� 대해 addinfo_cache가 실패했습니다"
 msgid "error building trees"
 msgstr "트리 빌드� 오류"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "'%s' 경로 만들기� 실패했습니다%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "하위 디렉터리� 공간� 만드려고 %s�(를) 제거합니다\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": 아마� D/F 충�?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "'%s' 위치� 추��지 않는 파�� 잃기를 거부합니다"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "%s '%s' 오브�트를 �� 수 없�"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s'� 대해 블롭� 예�"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "'%s'�(를) 여는� 실패: %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "'%s' 심볼릭 ��� 실패: %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "다�� 어떻게 할지 알 수 없습니다: %06o %s '%s'"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "내부 병합 실행� 실패"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "%s�(를) ��터베�스� 추가할 수 없습니다"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2163,7 +2181,7 @@ msgid ""
 msgstr ""
 "충�! (%s/삭제): %s (위치 %s) � %s (%s�서) 삭제. %s 버전� %s 트리� 남�."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2172,7 +2190,7 @@ msgstr ""
 "충�! (%s/삭제): %s (위치 %s) 삭제, %s�서 %s(으)로 (위치 %s). %s 버전� %s "
 "트리� 남�."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2181,7 +2199,7 @@ msgstr ""
 "충�! (%s/삭제): %s (위치 %s) � %s (위치 %s) 삭제. %s 버전� %s 트리� "
 "%s(으)로 남�."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2190,20 +2208,20 @@ msgstr ""
 "충�! (%s/삭제): %s (위치 %s) 삭제, %s�서 %s(으)로 (위치 %s). %s 버전� %s "
 "트리� 남� (위치 %s)."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "�름바꾸기"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "�름바꿈"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s�(는) %s� 있는 디렉터리로 %s(으)로 �름� 바꿉니다"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2212,141 +2230,141 @@ msgstr ""
 "충�! (�름바꾸기/�름바꾸기): \"%3$s\" 브랜치�서 �름바꾸기 \"%1$s\"->"
 "\"%2$s\" \"%6$s\" 브랜치�서 �름 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (해결�지 않�)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "충�! (rename/rename): �름 바꾸기 %s->%s (위치 %s). �름 바꾸기 %s->%s (위"
 "치 %s)"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "대신 �름� %s�서 %s(으)로 바꾸고 %s�서 %s(으)로 바꿉니다"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "충�! (rename/add): �름 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "병합� %s�(를) 추가합니다"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "대신 %s(으)로 추가합니다"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "%s 오브�트를 �� 수 없습니다"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "%s 오브�트는 블롭� 아닙니다"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "수정"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "수정�"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "ë‚´ìš©"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "추가/추가"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "건너뛰기: %s (기존과 같게 병합)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�� 병합: %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "하위 모듈"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "충�! (%s): %s� 병합 충�"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "제거: %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "파�/디렉터리"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "디렉터리/파�"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "충�! (%s): �름� %s� 디렉터리가 %s� 있습니다. %s�(를) %s(으)로 추가합니"
 "다"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "추가: %s"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "변경� ��스: 병합할 수 없습니다 (dirty: %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "�미 업��트 �태입니다!"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "%s � %s 트리� 병합� 실패했습니다"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "병합:"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "과거� 공통 커밋 %u개 발견:"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "병합 결과� 커밋� 없습니다"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "'%s' 오브�트를 파싱할 수 없습니다"
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "��스를 쓸 수 없습니다."
 
@@ -2366,16 +2384,16 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "노트 병합 작업� 다 마치지 않았습니다. (%s 있�)"
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "초기화하지 않았거나 레�런스하지 않� notes 트리를 커밋할 수 없습니다"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "잘못� notes.rewriteMode 값: '%s'"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "%s�서 노트를 다시 쓰기를 거부합니다 (refs/notes/ 밖임)"
@@ -2384,7 +2402,7 @@ msgstr "%s�서 노트를 다시 쓰기를 거부합니다 (refs/notes/ 밖임)
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "잘못� %s 값: '%s'"
@@ -2394,25 +2412,25 @@ msgstr "잘못� %s 값: '%s'"
 msgid "unable to parse object: %s"
 msgstr "오브�트를 파싱할 수 없습니다: %s"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "오프셋� 묶� 파� 앞입니다 (�가진 .idx?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "오프셋� %s� 묶� ��스 시작보다 앞입니다 (�가진 ��스?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "오프셋� %s� 묶� ��스 �보다 뒤입니다 (�가진 ��스?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "사용법: %s"
@@ -2420,17 +2438,17 @@ msgstr "사용법: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "  �는: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2520,7 +2538,7 @@ msgstr "'%s' 경로명세는 심볼릭 �� 아래� 있습니다"
 msgid "unable to parse --pretty format"
 msgstr "--pretty 형�� 파싱할 수 없습니다"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2529,7 +2547,7 @@ msgstr ""
 "index.version� 설정�었지만, � 값� 잘못�었습니다.\n"
 "%i 버전� 사용합니다"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2538,22 +2556,22 @@ msgstr ""
 "GIT_INDEX_VERSION� 설정�었지만, � 값� 잘못�었습니다.\n"
 "%i 버전� 사용합니다"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "'%s'�(를) 닫� 수 없습니다"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "'%s'�(를) stat()할 수 없습니다"
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "git 디렉터리를 열 수 없습니다: %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "�� 해제할 수 없습니다: %s"
@@ -2572,18 +2590,18 @@ msgstr "격리� 환경�서 레�런스 업��트가 금지�니다"
 msgid "could not remove reference %s"
 msgstr "%s 레�런스를 제거할 수 없습니다"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "%s 레�런스를 삭제할 수 없습니다: %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "레�런스를 삭제할 수 없습니다: %s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "없�"
 
@@ -2777,138 +2795,148 @@ msgstr "(HEAD %s(으)로부터 분리�)"
 msgid "(no branch)"
 msgstr "(브랜치 없�)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "없는 오브�트 %s, %s� 대해"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "%s� parse_object_buffer 실패 (%s� 대해)"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "'%s'� 잘못� 형�� 오브�트"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "�가진 �름 %s� 레�런스를 무시합니다"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "�가진 레�런스 %s 무시"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "형�: %%(end) 아톰� 없습니다"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "잘못� 형�� 오브�트 �름 %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "%s � %s�(를) 모� %s� 가져올 수 없습니다"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s�(는) 보통 %s�(를) 추�하고, %s�(를) 추�하지 않습니다"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s�(는) %s � %s 모� 추�합니다"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD가 브랜치를 가리키지 않습니다"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "그런 브랜치가 없습니다: '%s'"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "'%s' 브랜치� 대해 업스트림� 설정하지 않았습니다"
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "업스트림 '%s' 브랜치가 리모트 추� 브랜치로 저장�지 않았습니다"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "리모트 '%2$s'� 푸시 대� '%1$s'� 로컬 추� 브랜치가 없습니다"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "'%s' 브랜치� 푸시 리모트가 없습니다"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "'%s'� 대한 푸시 레�런스명세� '%s'�(가) 들어 있지 않습니다"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "푸시� 대�� 없습니다 (push.default가 'nothing'입니다)"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "하나� 대�� 대해 'simple' 푸시를 처리할 수 없습니다"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "현재 브랜치가 '%s' 기반�지만, 업스트림� 없어졌습니다.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (바로잡으려면 \"git branch --unset-upstream\"� 사용하십시오)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "브랜치가 '%s'� 맞게 업��트� �태입니다.\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "현재 브랜치와 '%s'�(가) 다른 커밋� 레�런스합니다.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr " (�세한 정보를 위해 \"%s\"�(를) 사용하십시오)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "브랜치가 '%s'보다 %d개 커밋만� 앞� 있습니다.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (로컬� 있는 커밋� 제출하려면 \"git push\"를 사용하십시오)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 msgstr[0] "브랜치가 '%s'보다 %d개 커밋 뒤� 있고, 앞으로 �릴 수 있습니다.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (로컬 브랜치를 업��트하려면 \"git pull\"� 사용하십시오)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2920,29 +2948,29 @@ msgstr[0] ""
 "현재 브랜치와 '%s'�(가) 갈�졌습니다,\n"
 "다른 커밋� �� %d개와 %d개 있습니다.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (리모트� 브랜치를 현재 브랜치로 병합하려면 \"git pull\"� 사용하십시오)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "현재 브랜치가 �가진 것처럼 보입니다"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "현재 '%s' 브랜치� 아� 아무 커밋� 없습니다"
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 옵션� --bisect 옵션과 호환�지 않습니다"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "/dev/null 열기 실패"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -2952,56 +2980,65 @@ msgstr ""
 "� 경고는 `git config advice.ignoredHook false` 명령으로 � 수 있습니다."
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "리모트 묶� 풀기 �태를 �는 �안 발�한 예�치 못한 플러시 패킷"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "리모트 묶� 풀기 �태를 파싱할 수 없습니다: %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "리모트 묶� 풀기 실패: %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "푸시 ��서 서명� 실패했습니다"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "받는 쪽�서 --signed 푸시를 지�하지 않습니다"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 "받는 쪽�서 --signed 푸시를 지�하지 않으므로 푸시 ��서를 보내지 않습니다"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "받는 쪽�서 --atomic 푸시를 지�하지 않습니다"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "받는 쪽�서 푸시 옵션� 지�하지 않습니다"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "잘못� 커밋 메시지 정리 모드 '%s'"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "알 수 없는 �작: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3009,7 +3046,7 @@ msgstr ""
 "� 충�� 해결한 뒤�, 바로잡� 경로를\n"
 "'git add <경로>' �는 'git rm <경로>'로 표시하십시오"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3019,43 +3056,43 @@ msgstr ""
 "'git add <경로>' �는 'git rm <경로>'로 표시하십시오.\n"
 "그리고 결과물� 'git commit'으로 커밋하십시오"
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "'%s'�(를) 잠글 수 없습니다"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "'%s'� 쓸 수 없습니다"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "'%s'� 줄바꿈� 쓸 수 없습니다"
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "'%s' 마치는� 실패했습니다."
+msgid "failed to finalize '%s'"
+msgstr "'%s' 마치는� 실패했습니다"
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "'%s'�서 �� 수 없습니다"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "로컬 변경 사항� %s 때문� �어 쓰게 �니다."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "변경 사항� 커밋하거나 스태시한 다� 계�하십시오."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: 정방향 진행"
@@ -3063,20 +3100,20 @@ msgstr "%s: 정방향 진행"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: 새 ��스 파�� 쓸 수 없습니다"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "HEAD 커밋� 찾� 수 없습니다"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "�시 트리를 업��트할 수 없습니다"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3106,17 +3143,124 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' 후�가 실패했습니다"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"�름과 전�메� 주소를 사용� �름과 호스트 �름� �용해서 ��으로\n"
+"설정했습니다. � 정보가 맞는지 확�하십시오. � 메시지를 보지 않으려면 정보"
+"를\n"
+"명시�으로 설정하십시오. 다� 명령어를 실행하고 편집기� 안내� 따� 설정\n"
+"파�� 편집하십시오:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"�렇게 한 다�, � 커밋� 사용한 신� 정보를 다�과 같� 해서 바꿀 수 있습니"
+"다:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"�름과 전�메� 주소를 사용� �름과 호스트 �름� �용해서\n"
+"��으로 설정했습니다. � 정보가 맞는지 확�하십시오. � 메시지를\n"
+"보지 않으려면 정보를 명시�으로 설정하십시오:\n"
+"\n"
+"    git config --global user.name \"내 �름\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"�렇게 한 다�, � 커밋� 사용한 신� 정보를 다�과 같� 해서 바꿀 수 있습니"
+"다:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "새로 만든 커밋� 찾아볼 수 없습니다"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "새로 만든 커밋� 파싱할 수 없습니다"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "커밋� 만든 후 HEAD를 찾� 수 없습니다"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "HEAD 분리�"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (최�위-커밋)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "HEAD를 파싱할 수 없습니다"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s�(는) 커밋� 아닙니다!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "HEAD 커밋� 파싱할 수 없습니다"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "커밋 작성�를 파싱할 수 없습니다"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree가 트리를 쓰는� 실패했습니다"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr " '%s'� 커밋 메시지를 �� 수 없습니다"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "커밋 오브�트를 쓰는� 실패했습니다"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "%s 커밋� 파싱할 수 없습니다"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "%s �전 커밋� 파싱할 수 없습니다"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3127,7 +3271,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3138,241 +3282,245 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "커밋 %d개가 섞� 결과입니다."
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "바로잡으려면 HEAD가 필요합니다"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "HEAD� 커밋 메시지를 �� 수 없습니다"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "'%s'�(를) 쓸 수 없습니다"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "1번째 커밋 메시지입니다:"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "%s� 커밋 메시지를 �� 수 없습니다"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "커밋 메시지 #%d번입니다:"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "커밋 메시지 #%d번� 건너�니다:"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "알 수 없는 명령: %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "��스 파�� 병합�지 않았습니다."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "%s 커밋� 병합�지만 -m 옵션� 주어지지 않았습니다."
 
 # FIXME: "parent %d" 번호가 무슨 �미?
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "%s 커밋� �전 커밋 %d�(가) 없습니다"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "메���� 지정했지만 %s 커밋� 병합 커밋� 아닙니다."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "%s� 대한 커밋 메시지를 가져올 수 없습니다"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: %s �전 커밋� 파싱할 수 없습니다"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 �름� 바꿀 수 없습니다"
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "다�� ��릴(revert) 수 없습니다: %s... %s"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "다�� �용할(apply) 수 없습니다: %s... %s"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "빈 커밋 모�� 건너 �니다"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: ��스 �기� 실패했습니다"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: ��스 새로 고침� 실패했습니다"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s(�)는 ��를 허용하지 않습니다: '%s'"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "없는 ��, %s� 대해"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "잘못� 줄 %d: %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "�전 커밋 없� '%s' 수행할 수 없습니다"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "'%s'�서 �� 수 없습니다."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "사용 불가능 �스트럭션 시트: '%s'"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "파싱한 커밋� 없습니다."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "��리기(revert) 중� 빼오기(cherry-pick)를 할 수 없습니다."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "빼오기(cherry-pick) 중� ��리기(revert)를 할 수 없습니다."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "잘못� 키: %s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s� 값� 잘못�: %s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "형�� 잘못� 옵션 시트: '%s'"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "�미 커밋 빼오기(cherry-pick) �는 ��리기(revert)가 진행 중입니다"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령� 해 보십시오"
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다"
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "HEAD를 잠글 수 없습니다"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "빼오기(cherry-pick) �는 ��리기(revert)가 진행 중�지 않습니다"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "HEAD를 구해 올 수 없습니다"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "새로 만들고 있는 브랜치�서 중지할 수 없습니다"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "'%s'�(를) 열 수 없습니다"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "'%s'�(를) �� 수 없습니다: %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "예�치 못하게 파�� �났습니다"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "빼오기 전� 저장한 HEAD 파��('%s') ���었습니다"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "HEAD를 옮긴 것 같습니다. ��리지 않습니다. HEAD를 확�하십시오!"
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "%s�(를) 업��트할 수 없습니다"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 복사할 수 없습니다"
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "��스를 �� 수 없습니다"
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3387,11 +3535,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "그리고 ��스 그리고/�는 작업 ��� 변경 사항� 있습니다\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3408,17 +3556,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�� 스태시 �용.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "%s�(를) 저장할 수 없습니다"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3429,57 +3577,52 @@ msgstr ""
 "변경 사항� 스태시 안� 안전하게 들어 있습니다.\n"
 "언제든지 \"git stash pop\" �는 \"git stash drop\"� 실행할 수 있습니다.\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "%s...  %.*s 위치�서 멈췄습니다\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "알 수 없는 명령 %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "orig-head를 �� 수 없습니다"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "'onto'를 �� 수 없습니다"
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "%s�(를) 업��트할 수 없습니다"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "HEAD를 %s 위치로 업��트할 수 없습니다"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "리베�스할 수 없습니다: 스테�징하지 않� 변경 사항� 있습니다."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "없는 커밋� 수정할 수 없습니다"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "잘못� 파�: '%s'"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "잘못� 내용: '%s'"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3489,45 +3632,45 @@ msgstr ""
 "작업 ��� 커밋하지 않� 변경 사항� 있습니다. � 사항� 먼저\n"
 "커밋하고 'git rebase --continue' 명령� 다시 실행하십시오."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "스테�징한 변경 사항� 커밋할 수 없습니다."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s 커밋� 빼올 수 없습니다"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: 잘못� 리비전"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "최초� 커밋으로 ��릴 수 없습니다"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: 처리하지 않� 옵션"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: 리비전 준비 중 오류"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "사용할 수 없는 할 � 목�: %s"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "rebase.missingCommitsCheck 옵션� 대해 ��할 수 없는 %s 설정. 무시합니다."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3536,7 +3679,7 @@ msgstr ""
 "경고: �부 커밋� ��치 않게 버려졌� 수� 있습니다.\n"
 "버려진 커밋 (최근�서 과거 순서):\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3554,7 +3697,7 @@ msgstr ""
 "가능한 �작�: ignore, warn, error\n"
 "\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3565,20 +3708,25 @@ msgstr ""
 "령� 실행합니다.\n"
 "�는 'git rebase --abort' 명령으로 리베�스를 중지할 수� 있습니다.\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "'%s' 커밋� 파싱할 수 없습니다"
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
-msgstr "스�립트를 �미 재구성했습니다"
+msgstr "스�립트를 �미 재구성했습니다."
+
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s'�(는) 저장소 밖입니다"
 
 #: setup.c:171
 #, c-format
@@ -3600,6 +3748,11 @@ msgstr ""
 "경로와 리비전� 구분하려면 다�과 같� '--'를 사용하십시오:\n"
 "'git <명령> [<리비전>...] -- [<파�>...]'"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "'%s' 옵션�  옵션� 아닌 �� 전� 와야 합니다"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3611,74 +3764,145 @@ msgstr ""
 "경로와 리비전� 구분하려면 다�과 같� '--'를 사용하십시오:\n"
 "'git <명령> [<리비전>...] -- [<파�>...]'"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "잘못� 설정� 사용하여 작업 ��를 설정할 수 없습니다"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "� 작업� 작업 ���서 실행해야 합니다"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "깃 저장소 버전 <= %d 버전� 기대하지만, %d 버전� 발견�었습니다"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "알 수 없는 저장소 확장� 있습니다:"
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "(현재 �� �는 �위 ��가) 깃 저장소가 아닙니다: %s"
+msgid "error opening '%s'"
+msgstr "'%s'�(를) 여는� 오류"
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ".git 파�� 너무 �니다: '%s'"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "%s�(를) �는� 오류"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "깃파� 형�� 잘못�었습니다: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "깃파�� 경로가 없습니다: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "깃 저장소가 아닙니다: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s'�(가) 너무 �니다"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "깃 저장소가 아닙니다: '%s'"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "'%s'� 대해 chdir를 할 수 없습니다"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
 msgstr "현재 디렉터리로 �아올 수 없습니다"
 
-#: setup.c:1052
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "(현재 �� �는 �위 �� 중 �부가) 깃 저장소가 아닙니다: %s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "'%*s%s%s'� 대해 stat()� 실패했습니다"
+
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "현재 작업 디렉터리를 �� 수 없습니다"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "'%s' 위치로 ��할 수 없습니다"
+msgid "cannot change to '%s'"
+msgstr "'%s'� 대해 변경 할 수 없습니다"
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"(현재 �� �는 마운트 위치 %s까지 �위 ��가) 깃 저장소가 아닙니다\n"
+"(현재 �� �는 �위 �� 부터 마운트 위치 %s 까지 �부가) 깃 저장소가 아닙니"
+"다\n"
 "파� 시스템 경계�서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정�지 않"
 "�)"
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 "core.sharedRepository 파�모드 값� (0%.3o) 문제가 있습니다.\n"
 "파�� 소유�� �기와 쓰기 권한� 있어야 합니다."
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "/dev/null 열기 �는 dup()� 실패"
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "fork 실패"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "setsid 실패"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "'%s' 경로가 없습니다"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "레�런스 '%s' 저장소를 연결� 체�아웃으로 쓰기는 아� 지�하지 않습니다."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "레�런스 '%s' 저장소가 로컬 저장소가 아닙니다."
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "레�런스 '%s' 저장소가 얕� 저장소입니다"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "레�런스 '%s' 저장소가 붙어 있는 저장소입니다"
@@ -3753,7 +3977,7 @@ msgstr "경로명세 '%s'�(는) ''%.*s' 하위 모듈 안� 있습니다"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "서브모듈 항목 '%s'(%s)�(는) %s�고, 커밋� 아닙니다"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "HEAD를 올바른 레�런스로 구해내는� 실패했습니다."
 
@@ -3777,7 +4001,7 @@ msgstr "하위 모듈 '%s'�서 'git status'를 실행할 수 없습니다"
 msgid "submodule '%s' has dirty index"
 msgstr "'%s' 하위 모듈� 변경� ��스가 있습니다"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3785,18 +4009,18 @@ msgstr ""
 "여러 개� 작업 ��가 있는 하위 모듈 '%s'� 대해 relocate_gitdir� 지�하지 "
 "않습니다"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "하위 모듈 '%s'� �름� 찾아볼 수 없습니다"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "'%s' 디렉터리를 만들 수 없습니다"
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3807,20 +4031,20 @@ msgstr ""
 "'%s'�서\n"
 "'%s'(으)로\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "재귀�으로 '%s' 하위 모듈� 들어갈 수 없습니다"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "'..' 안�서 ls-files를 시작할 수 없습니다"
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "버그: 리턴� 경로 문�열� 현재 디렉터리와 맞지 않습니다?"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree가 예�치 못한 코드 %d번� 리턴했습니다"
@@ -3898,7 +4122,7 @@ msgstr "'%1$s'� 업스트림� '%3$s'� '%2$s'(으)로 설정합니다\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: 잘못� 깊� 옵션: %s"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3907,7 +4131,7 @@ msgstr ""
 "다� 하위 모듈 경로� 리모트 어디�� 없는\n"
 "변경 사항� 있습니다:\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3934,11 +4158,11 @@ msgstr ""
 "명령� 시�해 보십시오\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "중지함."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "%s 레�런스를 �� 수 없습니다"
@@ -3959,7 +4183,7 @@ msgstr "트리 엔트리� 빈 파� �름"
 msgid "too-short tree file"
 msgstr "너무 짧� 트리 파�"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3968,7 +4192,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� 체�아웃 때문� �어 쓰게 �니다:\n"
 "%%s브랜치를 전환하기 전� 변경 사항� 커밋하거나 스태시하십시오."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3977,7 +4201,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� 체�아웃 때문� �어 쓰게 �니다:\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3986,14 +4210,14 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� 병합 때문� �어 쓰게 �니다:\n"
 "%%s병합하기 전� 변경 사항� 커밋하거나 스태시하십시오."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr "다� 파�� 로컬 변경 사항� 병합 때문� �어 쓰게 �니다."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4002,7 +4226,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� %s 때문� �어 쓰게 �니다:\n"
 "%%s%s 전� 변경 사항� 커밋하거나 스태시하십시오."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4011,7 +4235,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� %s 때문� �어 쓰게 �니다:\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4020,7 +4244,7 @@ msgstr ""
 "다� 디렉터리를 업��트하면 그 안� 추�하지 않는 파�� 잃어버립니다:\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4029,7 +4253,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 ��� 파�� 제거�니다:\n"
 "%%s브랜치를 전환하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4038,7 +4262,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4047,7 +4271,7 @@ msgstr ""
 "병합 때문� 추�하지 않는 다� 작업 ��� 파�� 제거�니다:\n"
 "%%s병합하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4056,7 +4280,7 @@ msgstr ""
 "병합 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4065,7 +4289,7 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 ��� 파�� 제거�니다:\n"
 "%%s%s 하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4074,7 +4298,7 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4084,7 +4308,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 ��� 파�� �어�니다:\n"
 "%%s브랜치를 전환하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4094,7 +4318,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4103,7 +4327,7 @@ msgstr ""
 "병합 때문� 추�하지 않는 다� 작업 ��� 파�� �어�니다:\n"
 "%%s병합하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4112,7 +4336,7 @@ msgstr ""
 "병합 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4121,7 +4345,7 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 ��� 파�� �어�니다:\n"
 "%%s%s 하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4130,12 +4354,12 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "'%s' 항목� '%s'와(과) 겹칩니다.  묶� 수 없습니다."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4145,7 +4369,7 @@ msgstr ""
 "았습니다:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4156,7 +4380,7 @@ msgstr ""
 "다:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4167,7 +4391,7 @@ msgstr ""
 "다:\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4176,12 +4400,12 @@ msgstr ""
 "하위 모듈�  업��트할 수 없습니다:\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "중지함\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "파�� 가져옵니다"
 
@@ -4214,18 +4438,43 @@ msgstr "잘못� �트 번호"
 msgid "invalid '..' path segment"
 msgstr "경로�서 잘못� '..' 부분"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "'%s'�(를) �는� 실패했습니다"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "메� 작업 ��� '%s'�(는) 저장소 디렉터리가 아닙니다"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s' 파�� 작업 �� 위치� 절대 경로를 가지지 않습니다"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s'�(가) 없습니다"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s'�(는) .git 파�� 아닙니다, �태 코드가 %d 입니다"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s'�(는) '%s'�(를) 가리키지 않습니다"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "�기와 쓰기용으로 '%s'�(를) 열 수 없습니다"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "'%s'�(를) �기용으로 열 수 없습니다"
@@ -4239,152 +4488,152 @@ msgstr "'%s'� 접근할 수 없습니다"
 msgid "unable to get current working directory"
 msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "병합하지 않� 경로:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (스테�지 해제하려면 \"git reset %s <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (스테�지 해제하려면 \"git rm --cached <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (해결했다고 표시하려면 \"git add <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (해결했다고 표시하려면 알맞게 \"git add/rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (해결했다고 표시하려면 \"git rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "커밋할 변경 사항:"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "커밋하�� 정하지 않� 변경 사항:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (무엇� 커밋할지 바꾸려면 \"git add <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (무엇� 커밋할지 바꾸려면 \"git add/rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (작업 ��� 변경 사항� 버리려면 \"git checkout -- <파�>...\"� 사용하십"
 "시오)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (하위 모듈� 추��지 않는 파��나 수정� 내용� 커밋하거나 버리십시오)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (커밋할 사항� �함하려면 \"git %s <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "양쪽�서 삭제:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "� 쪽�서 추가:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "저 쪽�서 삭제:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "저 쪽�서 추가:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "� 쪽�서 삭제:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "양쪽�서 추가:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "양쪽�서 수정:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "새 파�:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "복사함:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "삭제함:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "수정함:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "�름 바꿈:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "종류 바뀜:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "알 수 없�:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "병합하지 않�:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "새 커밋, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "수정한 내용, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "추�하지 않� 내용, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "현재 스태시� %d개 항목� 있습니다"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "변경�었지만 업��트하지 않� 하위 모듈:"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "커밋할 하위 모듈� 변경 사항:"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4392,227 +4641,227 @@ msgstr ""
 "위� 줄� 바꾸거나 지우지 마십시오.\n"
 "아래 있는 내용� 모� 무시�니다."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "병합하지 않� 경로가 있습니다."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (충�� 바로잡고 \"git commit\"� 실행하십시오)"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (병합� 중단하려면 \"git merge --abort\"를 사용하십시오)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "모든 충�� 바로잡았지만 아� 병합하는 중입니다."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (병합� 마무리하려면 \"git commit\"� 사용하십시오)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "am 세션 중간� 있습니다."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "현재 패치가 비어 있습니다."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (충�� 바로잡� 다� \"git am --continue\"를 사용하십시오)"
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (� 패치를 건너 뛰려면 \"git am --skip\"� 사용하십시오)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (�본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo가 없습니다."
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "완료한 명령 없�."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "최근 완료한 명령 (%d개 명령 완료):"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (�세한 정보는 %s 파� 참고)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "명령� 남아있지 않�."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "다�� 할 명령 (%d개 명령 남�):"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "현재 '%s' 브랜치를 '%s' 위로 리베�스하는 중입니다."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "현재 리베�스하는 중입니다."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (충�� 바로잡고 \"git rebase --continue\"를 사용하십시오)"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (� 패치를 건너뛰려면 \"git rebase --skip\"� 사용하십시오)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (�본 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 "  (모든 충�� 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "현재 '%s' 브랜치를 '%s' 위로 리베�스하는 중 커밋� 분리하는 중입니다."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr "현재 리베�스하는 중 커밋� 분리하는 중입니다."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  (작업 ��가 깨�해지면, \"git rebase --continue\"를 실행하십시오)"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "'%s' 브랜치를 '%s' 위로 리베�스하는 중 커밋� 편집하는 중입니다."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "리베�스 중� 커밋� 편집하는 중입니다."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (현재 커밋� 수정하려면 \"git commit --amend\"� 사용하십시오)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  (변경 사항� 만족할 때 \"git rebase --continue\"를 사용하십시오)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "현재 %s 커밋� 뽑아 내고 있습니다."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (충�� 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (모든 충�� 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (뽑기 작업� 취소하려면 \"git cherry-pick --abort\"를 사용하십시오)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "현재 %s 커밋� ��리는 중입니다."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (충�� 바로잡고 \"git revert --continue\"를 실행하십시오)"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (모든 충�� 바로잡았습니다: \"git revert --continue\"를 실행하십시오)"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (��리기 작업� 취소하려면 \"git revert --abort\"를 사용하십시오)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "'�등분하는 중입니다. '%s' 브랜치부터 시작."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "'�등분하는 중입니다."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (�래 브랜치로 �아가려면 \"git bisect reset\"� 사용하십시오)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "현재 브랜치 "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "대화형 리베�스 진행 중. 갈 위치는 "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "리베�스 진행 중. 갈 위치는 "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "HEAD가 다� 위치�서 분리: "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "HEAD가 다�으로부터 분리: "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "현재 어떤 브랜치� 사용하지 않�."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "최초 커밋"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "아� 커밋� 없습니다"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "추�하지 않는 파�"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "무시한 파�"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4623,20 +4872,20 @@ msgstr ""
 "'status -uno' 옵션� 쓰면 빨�질 수� 있지만, 새 파��\n"
 "�접 찾아서 추가해야 합니다. ('git help status' 참고)"
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "추�하지 않는 파�� 보지 않습니다%s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (추�하지 않는 파�� 보려면 -u 옵션� 사용하십시오)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "변경 사항 없�"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
@@ -4644,12 +4893,12 @@ msgstr ""
 "\"를\n"
 "사용하십시오)\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "커밋할 변경 사항� 추가하지 않았습니다\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4659,66 +4908,70 @@ msgstr ""
 "\"git\n"
 "add\"를 사용하십시오)\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "커밋할 사항� 추가하지 않았지만 추�하지 않는 파�� 있습니다\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "커밋할 사항 없� (파�� 만들거나 복사하고 \"git add\"를 사용하면 추�합니"
 "다)\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "커밋할 사항 없�\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "커밋할 사항 없� (추�하지 않는 파�� 보려면 -u 옵션� 사용하십시오)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "커밋할 사항 없�, 작업 �� 깨�함\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "아� 커밋� 없습니다, 위치: <"
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (브랜치 없�)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "다름"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "다� 뒤�: "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "다� 앞�: "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "%s 할 수 없습니다: 스테�징하지 않� 변경 사항� 있습니다."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "추가로, ��스� 커밋하지 않� 변경 사항� 있습니다."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s 할 수 없습니다: ��스� 커밋하지 않� 변경 사항� 있습니다."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "'%s' 파� 삭제� 실패했습니다"
@@ -4732,7 +4985,7 @@ msgstr "git add [<옵션>] [--] <경로명세>..."
 msgid "unexpected diff status %c"
 msgstr "예�치 못한 diff �태 %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "파� 업��트가 실패했습니다"
 
@@ -4780,7 +5033,7 @@ msgstr "'%s'�(를) �용할 수 없습니다"
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "다� 경로는 .gitignore 파� 중 하나 때문� 무시합니다:\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4790,7 +5043,7 @@ msgstr "가짜로 실행"
 msgid "interactive picking"
 msgstr "대화�으로 고릅니다"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "대화�으로 변경� 부분� 선�합니다"
 
@@ -4914,10 +5167,10 @@ msgstr "아무 것ë�„ 지정하지 않았으므로 아무 것ë�„ 추가하지 ì•
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "'git add .' 명령� 실행하려고 한 것 아니었습니까?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "��스 파�� ���었습니다"
 
@@ -4969,58 +5222,58 @@ msgstr "시간대 오프셋� 잘못�었습니다"
 msgid "Patch format detection failed."
 msgstr "패치 형� 검색� 실패했습니다."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "'%s' 디렉터리 만들기가 실패했습니다"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "패치를 쪼개는� 실패했습니다."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "��스 파�� 쓸 수 없습니다"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "� 문제를 해결했� 때 \"%s --continue\"를 실행하십시오."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "� 패치를 건너뛰려면, 그 대신 \"%s --skip\"� 실행하십시오."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "�래 브랜치를 복구하고 패치 �용� 중지하려면 \"%s --abort\"를 실행하십시오."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "패치가 비어 있습니다."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "잘못� 신� 줄: %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "%s 커밋� 파싱할 수 없습니다"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "저장소� 3-방향 병합으로 대신할 때 필요한 블롭� 없습니다."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr "��스 정보를 사용해 기본 트리를 다시 만듭니다..."
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5028,38 +5281,29 @@ msgstr ""
 "패치를 �접 편집하셨습니까?\n"
 "� 패치는 ��스� 기�� 블롭�는 �용�지 않습니다."
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "베�스 패치 �용 � 3-방향 병합으로 대신합니다..."
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "변경 사항�서 병합하는� 실패했습니다."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree가 트리를 쓰는� 실패했습니다"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "빈 커밋 내역� 대해 �용합니다"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "커밋 오브�트를 쓰는� 실패했습니다"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "다시 시작할 수 없습니다: %s�(가) 없습니다."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "터미�� 표준 입력� 연결�지 않� �태�서 대화형으로 실행할 수 없습니다."
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "커밋 본문�:"
 
@@ -5067,35 +5311,34 @@ msgstr "커밋 본문�:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "�용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모� �용[a]: "
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "변경� ��스: 패치를 �용할 수 없습니다 (dirty: %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�용하는 중: %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "변경 사항 없� -- 패치가 �미 �용�었습니다."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "패치가 %s %.*s 위치�서 실패했습니다"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "실패한 패치� 복사본� 다� 위치� 있습니다: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr "'git am --show-current-patch'를 사용하여 실패한 패치를 볼 수 있습니다"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5105,7 +5348,7 @@ msgstr ""
 "커밋으로 표시할 사항� 남아 있지 않으면, �미 같� 패치�서 �용�\n"
 "경우� 수� 있습니다. 그런 경우�는 � 패치를 건너뛰면 �니다."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5116,17 +5359,17 @@ msgstr ""
 "충�� 해결한 파�� 'git add'해서 해결했다고 표시해야 합니다.\n"
 "파�� \"저 쪽�서 삭제\"를 받아들�려면 `git rm`� 실행하십시오."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "'%s' 오브�트를 파싱할 수 없습니다."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "��스 지우기� 실패했습니다"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5134,136 +5377,144 @@ msgstr ""
 "마지막 'am' 실패 �후 HEAD를 옮긴 것 같습니다.\n"
 "ORIG_HEAD로 ��리지 않습니다."
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "--patch-format 옵션� 대해 잘못� 값: %s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<옵션>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<옵션>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "대화형으로 실행합니다"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "아무 �작� 하지 않습니다 (과거부터 있었� 옵션)"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "필요하면 3-방향 병합으로 대신하�� 허용합니다"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "간략히 표시합니다"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "커밋 메시지� Signed-off-by 줄� 남�니다"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "UTF-8 �코딩으로 변환합니다 (기본값)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "git-mailinfo� -k 옵션� �니다"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "git-mailinfo� -b 옵션� �니다"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "git-mailinfo� -m 옵션� �니다"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "mbox 형�� 대해 git-mailsplit� --keep-cr 옵션� 사용합니다"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "am.keepcr� 무관하게 git-mailsplit� --keep-cr 옵션� 사용하지 않습니다."
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "절취선 앞� 모든 사항� 무시합니다"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "git-apply� 넘�니다"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "형�"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "패치� 형�"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "패치 실패가 발�했� 때 오류 메시지 대신 사용합니다"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "충�� 해결한 다� 패치 �용� 계�합니다"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "--continue 옵션과 ��"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "현재 패치 건너뛰기"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr "�래 브랜치를 복구하고 패치 �용 작업� 중지합니다."
 
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "패치 작업� 중단하지만 HEAD는 그대로 둡니다."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "�용�는 패치를 보여�니다."
+
 # NOTE: 옵션� �미는 �게 맞다. �문�서는 사용�가
 # --committer-date-is-author-date�는 옵션� 보고 �미를 알 수 있다고 가정하고 있다.
-#: builtin/am.c:2254
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "커미터 시�� 작성� 시�으로 넣습니다"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "현재 시�� 작성� 시�으로 사용합니다"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "키-ID"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "GPG 서명 커밋"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(git-rebase를 위한 내부 용�)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5271,16 +5522,16 @@ msgstr ""
 "-b/--binary 옵션� 오랜 시간 �안 아무 �작� 하지 않았으므로, �\n"
 "옵션� 제거� 예정입니다. �제 사용하지 마십시오."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "��스 �기� 실패했습니다"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "�전 리베�스 디렉터리 %s�(가) 아� 있고 mbox를 지정했습니다."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5289,7 +5540,7 @@ msgstr ""
 "벗어난 %s 디렉터리가 발견�었습니다.\n"
 "제거하려면 \"git am --abort\"를 사용하십시오."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "해소 작업� 진행 중입니다. 다시 시작하지 않습니다."
 
@@ -5311,8 +5562,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: URL 없는 리모트"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: ACK/NAK가 와야 하지만, EOF를 받았습니다"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: ACK/NAK가 와야 하지만, 플러시 패킷� 받았습니다"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5398,107 +5649,107 @@ msgstr "git blame [<옵션>] [<리비전-옵션>] [<리비전>] [--] <파�>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<리비전-옵션>� git-rev-list(1)� 설명�어 있습니다"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "블레임 항목� 찾�마� �진�으로 표시합니다"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "가장�리 커밋� 대해 빈 SHA-1� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "최�위 커밋� 가장�리 커밋으로 취급하지 않습니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "작업 비용 통계를 표시합니다"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "강제로 진행 �황� 표시합니다"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "블레임 항목� 대해 출력 �수를 표시합니다"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "�래 파� �름 표시 (기본값: ��)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "�래 줄 번호 표시 (기본값: 하지 않�)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "컴퓨터 처리용으로 설계� 형�으로 표시합니다"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "줄마다 커밋 정보가 표시�는 사용�용 형�으로 표시합니다"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "git-annotate와 ��한 형�� 사용합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "내부 형�으로 시�� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "길게 커밋 SHA1� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "작성� �름과 시�� 표시하지 않습니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr "작성� �름 대신� 전�메�� 표시합니다 (기본값: 꺼�)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "공백 문� 차��� 무시합니다"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "diff를 향�하는� 실험�� 휴리스틱� 사용합니다"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "� �치하는 항목� 찾는� � 시간� 소모합니다"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "git-rev-list를 호출하는 대신 <파�>�서 리비전� 사용합니다"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "<파�>� 내용� 최종 �미지로 사용합니다"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "�수"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "파� 내부와 파� 사�� 복사� 줄� 찾습니다"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "파� 내부와 파� 사�� 옮겨진 줄� 찾습니다"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "n,m줄 (1번 줄부터 시작) 사�� 범위만 처리"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress 옵션� --incremental 옵션�나 �스레� 형��서 사용할 수 없습니다"
@@ -5511,17 +5762,17 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "4년 11달 전"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "%s 파��는 줄� %lu개 �입니다"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "블레임 줄"
 
@@ -5810,17 +6061,17 @@ msgstr "병합�지 않는 브랜치만 표시합니다"
 msgid "list branches in columns"
 msgstr "목�� 여러 열로 표시합니다"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "키"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "정렬한 기준� �는 필드 �름"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "오브�트"
 
@@ -5828,16 +6079,16 @@ msgstr "오브�트"
 msgid "print only branches of the object"
 msgstr "해당 오브�트� 브랜치만 표시합니다"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "정렬과 필터�� 대소문�를 구분하지 않습니다"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "출력� 사용할 형�"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "레�런스/헤드 아래� HEAD가 없습니다!"
 
@@ -5938,7 +6189,7 @@ msgstr "번들� 만드려면 저장소가 필요합니다."
 msgid "Need a repository to unbundle."
 msgstr "번들� 해제하려면 저장소가 필요합니다."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5946,7 +6197,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <종류> | --textconv | --filters) [--path=<경로>] <오브�트>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5954,64 +6205,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<종류>는 다� 중 하나가 � 수 있습니다: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "오브�트 종류를 봅니다"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "오브�트 �기를 봅니다"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "오류가 없� 때 0� 리턴하고 �냅니다"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "오브�트� 내용� 예�게 표시합니다"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "블롭 오브�트� 대해서는, 오브�트� 내용� 대해 textconv를 실행합니다"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "블롭 오브�트� 대해서는, 오브�트� 내용� 대해 필터를 실행합니다"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "블롭"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "--textconv/--filters 옵션� 경로를 지정합니다"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s � -t 옵션� ��� 오브�트� 대해 �작하�� 허용합니다"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "--batch 출력� 대해 버��합니다"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr "표준 입력�서 입력� 오브�트� 정보와 내용� 표시합니다"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "표준 입력�서 입력� 오브�트� 정보를 표시합니다"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "트리 내부� 심볼릭 ��를 따�갑니다 (--batch �는 --batch-check와 같� 사용)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "--batch �는 --batch-check�서 모든 오브�트를 표시합니다"
 
@@ -6031,7 +6282,7 @@ msgstr "파�� 설정� 모든 �성� 표시합니다"
 msgid "use .gitattributes only from the index"
 msgstr "��스�서만 .gitattributes를 사용합니다"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "표준 입력�서 파� �름� �습니다"
 
@@ -6039,7 +6290,7 @@ msgstr "표준 입력�서 파� �름� �습니다"
 msgid "terminate input and output records by a NUL character"
 msgstr "NUL 문�를 기준으로 �료 입력 � 출력� 멈춥니다"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "진행 �황 표시를 하지 않습니다"
 
@@ -6051,27 +6302,27 @@ msgstr "�치하지 않는 입력 경로를 표시합니다"
 msgid "ignore index when checking"
 msgstr "검사할 때 ��스를 무시합니다"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "--stdin으로 경로 �름� 지정할 수 없습니다"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z 옵션� --stdin 옵션과 같� �야만 �미가 있습니다"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "경로를 지정하지 않았습니다"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet 옵션� 하나� 경로 �름과 같� �야 합니다"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "--quiet � --verbose 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 옵션� --verbose 옵션과 같� �야 합니다"
 
@@ -6129,9 +6380,9 @@ msgid "write the content to temporary files"
 msgstr "내용� 임시 파�� �니다"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "문�열"
 
@@ -6176,80 +6427,80 @@ msgstr "'%s' 경로� 필요한 버전� 없습니다"
 msgid "path '%s': cannot merge"
 msgstr "'%s' 경로: 병합할 수 없습니다"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "'%s'� 대한 병합 결과를 추가할 수 없습니다"
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 옵션� 업��트하는 경로�서 쓸 수 없습니다"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' 옵션� %s 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "경로를 업��트하고 '%s' 브랜치로 전환하는 �� �시� 할 수 없습니다."
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "'%s' 경로를 병합하지 않았습니다"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "현재 ��스를 먼저 해결해야 합니다"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "'%s'� 대해 reflog할 수 없습니다: %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD� 현재 위치는"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "HEAD를 업��트할 수 없습니다"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "'%s' 브랜치 리셋\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�미 '%s'� 있습니다\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "'%s' 브랜치로 전환합니다\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 그리고 %d개 �.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6267,7 +6518,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6288,161 +6539,161 @@ msgstr[0] ""
 " git branch <새-브랜치-�름> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "리비전 walk� 내부 오류"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "�전 HEAD 위치는"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "현재 위치가 만들 예정� 브랜치� 있습니다"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "하나� 레�런스만 지정해야 하지만 %d개를 지정했습니다."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "잘못� 레�런스: %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "레�런스가 트리가 아닙니다: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "브랜치를 전환하는� 경로를 사용할 수 없습니다"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 옵션� 브랜치를 전환할 때 쓸 수 없습니다"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 옵션� '%s' 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "브랜치를 커밋� 아닌 '%s'(으)로 전환할 수 없습니다"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "브랜치"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "새 브랜치를 만들고 가져옵니다"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "새 브랜치� 대한 reflog를 만듭니다"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "HEAD를 해당 커밋�서 분리합니다"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "새 브랜치� 대한 업스트림 정보를 설정합니다"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "새-브랜치"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "�위 브랜치가 없는 새 브랜치"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "병합�지 않� 파�� 대해 우리쪽 버전� 가져옵니다"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "병합�지 않� 파�� 대해 �대편 버전� 가져옵니다"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "강제로 체�아웃합니다 (로컬�서 수정한 사항� 버립니다)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "새 브랜치� 대해 3-방향 병합� 수행합니다"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "무시하는 파�� 업��트합니다 (기본값)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "스타�"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "충� 스타� (merge �는 diff3)"
 
 # FIXME: �미 불명
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "경로명세를 드문 항목�만 제한하지 않습니다"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "'git checkout <없는-브랜치>'� 대해 추측합니다"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr "다른 작업��� 주어진 레�런스가 있는지 확�하지 않습니다"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "강제로 진행 �황� 표시합니다"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B � --orphan 옵션� 서로 호환�지 않습니다"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track 옵션� 브랜치 �름� 필요합니다"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "브랜치 �름� 없습니다. -b 옵션� 사용해 보십시오"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "경로 명세가 잘못�었습니다"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s'�(는) 커밋� 아니고 여기�서 '%s' 브랜치를 만들 수 없습니다"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach 옵션� 경로 ��를 받지 않습니다 '%s'"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6541,7 +6792,7 @@ msgstr "삭제할 항목� 선�하십시오"
 msgid "Remove %s [y/N]? "
 msgstr "%s 제거합니까 [y/N]? "
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "�.\n"
@@ -6564,11 +6815,11 @@ msgstr ""
 "help                - � 화면 표시\n"
 "?                   - 프롬프트 선� �움�"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** 명령 ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "무엇� 할까요"
 
@@ -6597,8 +6848,8 @@ msgstr "대화형 지우기"
 msgid "remove whole directories"
 msgstr "전체 디렉터리 제거"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6636,144 +6887,144 @@ msgstr ""
 "clean.requireForce 기본값� true�고 -i, -n, -f 옵션 중 하나� 쓰지 않았습니"
 "다. 지우지 않습니다"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "체�아웃� 만들지 않습니다"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "간략한 저장소를 만듭니다"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "로컬 저장소�서 복제합니다"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "로컬 하드��를 사용하지 않고, 항� 복사합니다"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "공유 저장소로 설정합니다"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "경로명세"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "복제한 결과물�서 하위 모듈� 초기화합니다"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "병렬�으로 복제하는 하위모듈 개수"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "서�-디렉터리"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "서�� 사용할 디렉터리 위치"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "레�런스 저장소"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "복제할 경우�만 --reference를 사용합니다"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "�름"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "업스트림 추�� 'origin' 대신 <�름>� 사용합니다"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "리모트� HEAD 대신 <브랜치>를 가져옵니다"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "리모트� git-upload-pack 경로"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "깊�"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "지정한 깊�� 얕� 복제를 만듭니다"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "시�"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "지정한 시간 �후� 얕� 복제를 만듭니다"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "리비전"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "리비전� 제외해 얕� 복제� 커밋 내역� 깊게 만듭니다"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "하나� 브랜치만 복제합니다 (HEAD �는 --branch로 지정)"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "태그를 복제하지 않습니다. 나중� 가져올 때� 태그를 따르지 않습니다."
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "모든 복제한 하위 모듈� 얕� 모듈입니다"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "깃 디렉터리를 작업 ��와 별개� 위치� 놓습니다"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "키=값"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "새 저장소 안�서 설정합니다"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "IPv4 주소만 사용합니다"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "IPv6 주소만 사용합니다"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6781,42 +7032,42 @@ msgstr ""
 "디렉터리 �름� 알아낼 수 없습니다.\n"
 "명령행�서 디렉터리를 지정하십시오"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "정보: '%s'� 대한 보조 파�� 추가할 수 없습니다: %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "'%s'�(를) 여는� 실패"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "'%s'�(가) 있지만 디렉터리가 아닙니다"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "'%s'� 대해 stat()� 실패했습니다\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "'%s' ��를 만드는� 실패했습니다"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "파�� '%s'(으)로 복사하는� 실패했습니다"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "완료.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6826,99 +7077,99 @@ msgstr ""
 "'git status' 명령으로 무엇� 체�아웃했는지 살펴볼 수 있고\n"
 "'git checkout -f HEAD'로 체�아웃� 다시 할 수 있습니다\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "복제할 리모트� %s 브랜치를 찾� 수 없습니다."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "리모트�서 필요한 오브�트를 모� 보내지 않았습니다"
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "%s�(를) 업��트할 수 없습니다"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "리모트 HEAD가 없는 레�런스를 참고하므로, 체�아웃할 수 없습니다.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "작업 ��를 체�아웃할 수 없습니다"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "파�미터를 설정 파�� 쓸 수 없습니다"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "정리용으로 repack할 수 없습니다"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "보조 임시 파�� 삭제할 수 없습니다"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "너무 ��가 많습니다."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "복제할 저장소를 지정해야 합니다."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare � --origin %s 옵션� 호환�지 않습니다."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare � --separate-git-dir 옵션� 호환�지 않습니다."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "'%s' 저장소가 없습니다"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "깊�가(%s) 0보다 � 수가 아닙니다"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "대� 경로가('%s') �미 있고 빈 디렉터리가 아닙니다."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "작업 ��가('%s') �미 있습니다."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "'%s'� 앞 디렉터리를 만들 수 없습니다"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
-msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
+msgstr "작업 ��를('%s') 만들 수 없습니다"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "간략한 저장소로('%s') 복제합니다...\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "'%s'� 복제합니다...\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6926,37 +7177,42 @@ msgstr ""
 "clone --recursive 옵션� --reference � --reference-if-able 옵션� 같� 쓰는 "
 "것과 호환�지 않습니다"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하십시오."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하십"
 "시오."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하"
 "십시오."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+"--filter 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하십시오."
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "�본 저장소가 얕� 저장소�므로, --local 옵션� 무시합니다"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local 옵션� 무시�니다"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "리모트� %s 브랜치가 업스트림 %s� 없습니다"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "빈 저장소를 복제한 것처럼 보입니다."
 
@@ -6992,67 +7248,15 @@ msgstr "열 사�� 채울 공백"
 msgid "--command must be the first argument"
 msgstr "--command는 첫 번째 ��여야 합니다"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<옵션>] [--] <경로명세>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<옵션>] [--] <경로명세>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"�름과 전�메� 주소를 사용� �름과 호스트 �름� �용해서 ��으로\n"
-"설정했습니다. � 정보가 맞는지 확�하십시오. � 메시지를 보지 않으려면 정보"
-"를\n"
-"명시�으로 설정하십시오. 다� 명령어를 실행하고 편집기� 안내� 따� 설정\n"
-"파�� 편집하십시오:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"�렇게 한 다�, � 커밋� 사용한 신� 정보를 다�과 같� 해서 바꿀 수 있습니"
-"다:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"�름과 전�메� 주소를 사용� �름과 호스트 �름� �용해서\n"
-"��으로 설정했습니다. � 정보가 맞는지 확�하십시오. � 메시지를\n"
-"보지 않으려면 정보를 명시�으로 설정하십시오:\n"
-"\n"
-"    git config --global user.name \"내 �름\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"�렇게 한 다�, � 커밋� 사용한 신� 정보를 다�과 같� 해서 바꿀 수 있습니"
-"다:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7062,7 +7266,7 @@ msgstr ""
 "--allow-empty 옵션과 같� � 명령� 반복할 수� 있고, \"git reset HEAD\"\n"
 "명령으로 커밋� 완전히 제거할 수� 있습니다.\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7076,11 +7280,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "아니면 'git reset'� 사용하십시오\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7096,61 +7300,61 @@ msgstr ""
 "그 다�� \"git cherry-pick --continue\"를 하면 나머지 커밋�\n"
 "대해 커밋 빼오기를 다시 시작합니다.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "HEAD 트리 오브�트� 묶�� 푸는� 실패했습니다"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "임시 ��스를 만들 수 없습니다"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "대화형 추가가 실패했습니다"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "임시 ��스를 업��트할 수 없습니다"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "주요 �시 트리를 업��트하는� 실패했습니다"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "new_index 파�� 쓸 수 없습니다"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "병합하는 중 부분 커밋� 할 수 없습니다."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "커밋 빼오기를 하는 중 부분 커밋� 할 수 없습니다."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "임시 ��스 파�� 쓸 수 없습니다"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "'%s' 커밋� 작성� 헤�가 없습니다"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "'%s' 커밋� 작성� 헤� 형�� 잘못�었습니다"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "--author 파�미터 형�� 잘못�었습니다"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7158,38 +7362,38 @@ msgstr ""
 "현재 커밋 메시지�서 사용�지 않는 주� 문�를\n"
 "선�할 수 없습니다"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "%s 커밋� 찾아볼 수 없습니다"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(표준 입력�서 로그 메시지를 ��)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "표준 입력�서 로그 메시지를 �� 수 없습니다"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "'%s' 로그 파�� �� 수 없습니다"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "SQUASH_MSG를 �� 수 없습니다"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "MERGE_MSG를 �� 수 없습니다"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "커밋 서�� 쓸 수 없습니다"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7204,7 +7408,7 @@ msgstr ""
 "\t%s\n"
 "다시 시�하십시오.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7219,7 +7423,7 @@ msgstr ""
 "\t%s\n"
 "다시 시�하십시오.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7228,7 +7432,7 @@ msgstr ""
 "변경 사항� 대한 커밋 메시지를 입력하십시오. '%c' 문�로 시작하는\n"
 "줄� 무시�고, 메시지를 입력하지 않으면 커밋� 중지�니다.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7239,145 +7443,149 @@ msgstr ""
 "줄� 보존�니, 필요하면 �접 제거하십시오. 메시지를 입력하지\n"
 "않으면 커밋� 중지�니다.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s작성�:    %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s시�:      %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s커미터: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "트리를 만드는� 오류"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "메시지를 -m �는 -F 옵션으로 입력하십시오.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' 옵션� '�름 <전�메�>' 형�� 아니고 기존 작성��� 없습니다"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "무시한 모드가 ('%s') 잘못�었습니다"
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "추��지 않는 파� 모드가 ('%s') 잘못�었습니다"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "--long � -z 옵션� 호환�지 않습니다"
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "--reset-author � --author 옵션� 모� 사용하면 앞뒤가 맞지 않습니다"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "바꿀 사항� 없습니다."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "병합 중� 있습니다 -- 커밋� 바꿀 수 없습니다."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "커밋 빼오기 중� 있습니다 -- 커밋� 바꿀 수 없습니다."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "--squash � --fixup 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "-c/-C/-F/--fixup 옵션 중� 하나만 사용할 수 있습니다."
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "-m 옵션� -c/-C/-F/--fixup 옵션과 같� 쓸 수 없습니다."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "-m 옵션� -c/-C/-F 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 옵션� -C, -c �는 --amend 옵션과 같� �야 합니다."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
 "다."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "경로가 없� --include/--only 옵션� 쓰면 앞뒤가 맞지 않습니다."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "잘못� 정리 모드 %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "-a 옵션과 경로를 같� 사용하면 앞뒤가 맞지 않습니다."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "�태를 간략하게 표시합니다"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "브랜치 정보를 표시합니다"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "스태시 정보를 표시합니다"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "앞/뒤 값 전체를 계산합니다"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "버전"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "컴퓨터가 �� 수 있는 형�"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "긴 형�으로 �태를 표시합니다 (기본값)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "NUL 문�로 항목� �냅니다"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "모드"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "추��지 않는 파�� 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -7385,11 +7593,11 @@ msgstr ""
 "무시� 파�� 표시합니다. 추가 옵션: traditional, matching, no. (기본값: "
 "traditional)"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "언제"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7397,207 +7605,183 @@ msgstr ""
 "하위 모듈� 변경� 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: "
 "all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "추��지 않는 파�� 목�� 여러 열로 표시합니다"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "무시한 모드와 추��지 않는 파�� �수가 지��지 않는 조합입니다"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "새로 만든 커밋� 찾아볼 수 없습니다"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "새로 만든 커밋� 파싱할 수 없습니다"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "커밋� 만든 후 HEAD를 찾� 수 없습니다"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "HEAD 분리�"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (최�위-커밋)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "성공�� 커밋 후� 요약� 표시하지 않습니다"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "커밋 메시지 서�� diff를 표시합니다"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "커밋 메시지 옵션"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "파��서 메시지를 �습니다"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "작성�"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "커밋� 작성�를 지정합니다"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "시�"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "커밋� 시�� 지정합니다"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "메시지"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "커밋 메시지"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "커밋"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "지정한 커밋� 메시지를 재사용하고 편집합니다"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "지정한 커밋�서 메시지를 재사용합니다"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "지정한 커밋� 수정하는� autosquash 형� 메시지를 사용합니다"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "지정한 커밋� 합치는� autosquash 형� 메시지를 사용합니다"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "커밋� 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같� 사용)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "Signed-off-by: 줄� 추가합니다"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "지정한 서� 파�� 사용합니다"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "커밋 편집� 강제합니다"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "기본값"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "메시지�서 공백과 #주�� 지�니다"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "커밋 메시지 서�� �태를 �함합니다"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG 서명 커밋"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "커밋 내용 옵션"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "변경� 파�� 모� 커밋합니다"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "지정한 파�� 커밋할 ��스� 추가합니다"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "대화형으로 파�� 추가합니다"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "대화형으로 변경 사항� 추가합니다"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "지정한 파�만 커밋합니다"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "커밋 전 후�와 커밋 메시지 후�를 건너�니다"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "무엇� 커밋할지 표시합니다"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "바로 앞 커밋� 바꿉니다"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "다시쓰기 후 후�를 건너�니다"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "빈 변경 사항� 기�하�� 허용합니다"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "빈 메시지와 같� 변경 사항� 기�하�� 허용합니다"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "HEAD 커밋� 파싱할 수 없습니다"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��� MERGE_HEAD 파� (%s)"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "MERGE_MODE를 �� 수 없습니다"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "커밋 메시지를 �� 수 없습니다: %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "커밋� 중지합니다. 커밋 메시지가 비어 있습니다.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "커밋� 중지합니다. 메시지를 편집하지 않았습니다.\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7824,22 +8008,22 @@ msgstr "주� 달린 %s 태그� 내장� �름� 없습니다"
 msgid "tag '%s' is really '%s' here"
 msgstr "'%s' 태그가 실제 여기 '%s'입니다"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "어떤 태그� '%s'와(과) 정확히 �치하지 않습니다"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "어떤 레�런스나 태그� 정확히 �치하지 않고, 설명� 검색합니다\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "%s�서 검색 마침\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7848,7 +8032,7 @@ msgstr ""
 "어떤 주� 달린 태그� '%s'�(를) 설명하지 않습니다.\n"
 "하지만 주� 달리지 않� 태그가 있습니다: --tags 옵션� 해 보십시오."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7857,12 +8041,12 @@ msgstr ""
 "어떤 태그� '%s'�(를) 설명할 수 없습니다.\n"
 "--always 옵션� � 보거나, 태그를 만들어 보십시오."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "커밋 %lu개를 가로질렀습니다\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7871,90 +8055,90 @@ msgstr ""
 "태그를 %i개 넘게 찾았습니다. 가장 최근� %i개 목��\n"
 "표시합니다. %s 위치�서 검색� 중지합니다.\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "%s 설명합니다\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "올바른 오브�트 �름� 아닙니다 (%s)"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s(�)는 커밋� 블롭� 아닙니다"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "커밋 다�� 오는 태그를 찾습니다"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "표준 오류�서 검색 전략� 디버깅합니다"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "모든 레�런스를 사용합니다"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "모든 태그를, 주� 달리지 않� 태그까지 사용합니다"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "항� 긴 형�� 사용합니다"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "첫 번째 �전 커밋만 따�갑니다"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "정확히 �치하는 항목만 출력합니다"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "<n>개� 가장 최근� 태그만 고려합니다 (기본값: 10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "<패턴>과 �치하는 태그만 고려합니다"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "<패턴>과 �치하는 태그를 고려하지 않습니다"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "대안으로 요약한 커밋 오브�트를 표시합니다"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "표시"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "변경� 작업 ��� <표시>를 뒤� 붙입니다 (기본값: \"-dirty\")"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "�가진 작업 ��� <표시>를 뒤� 붙입니다 (기본값: \"-broken\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 옵션� --abbrev=0 옵션과 호환�지 않습니다"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "�름� 없습니다. 아무것� 설명할 수 없습니다."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 옵션� 커밋같� 항목과 호환�지 않습니다"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 옵션� 커밋같� 항목과 호환�지 않습니다"
 
@@ -8140,183 +8324,187 @@ msgstr "레�런스명세를 내보낸 레�런스� �용합니다"
 msgid "anonymize output"
 msgstr "출력� �명화합니다"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<옵션>] [<저장소> [<레�런스명세>...]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<옵션>] <그룹>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<옵션>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "모든 리모트�서 가져옵니다"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "�어쓰지 �고 .git/FETCH_HEAD� �붙입니다"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "리모트 쪽� 묶�� 업로드할 경로"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "로컬 브랜치를 강제로 �어�니다"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "여러 리모트�서 가져옵니다"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "모든 태그와 관련 오브�트를 가져옵니다"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "병렬�으로 받아오는 하위모듈 개수"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "리모트� �제 없는 리모트 추� 브랜치를 잘�냅니다"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "리모트 저장소� 없는 로컬 태그를 제거하고 변경� 태�를 �용합니다"
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "주문형"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "하위 모듈 재귀�으로 가져오기 방�� 설정합니다"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "다운로드한 묶�� 보존합니다"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "HEAD 레�런스 업��트를 허용합니다"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "얕� 복제� 커밋 내역� 깊게 만듭니다"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "얕� 복제� 커밋 내역� 시간� 기준으로 깊게 만듭니다"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "완전한 저장소로 전환합니다"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "디렉터리"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "하위 모듈 경로 출력� 앞� � 디렉터리를 붙입니다"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "하위 모듈� 재귀�으로 가져올 때 기본값 (설정 파�보다 낮� 우선 순위)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr ".git/shallow를 업��트하는 레�런스를 허용합니다"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "레�런스맵"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "레�런스맵 가져오기를 지정합니다"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "리모트 레�런스 HEAD를 찾� 수 없습니다"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "fetch.output 설정� 잘못� 값� 있습니다: %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "%s 오브�트가 없습니다"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[최신 �태]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[거부�]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "현재 브랜치�서 가져올 수 없�"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[태그 업��트]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "로컬 레�런스를 업��트할 수 없습니다"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[새로운 태그]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[새로운 브랜치]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[새로운 레�런스]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "강제 업��트"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "정방향 진행� 아님"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s�(가) 모든 필요한 오브�트를 보내지 않았습니다\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "얕� 최�위� 업��트가 허용�지 않으므로 %s�(를) 거부합니다"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "%.*s URL�서\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8325,50 +8513,57 @@ msgstr ""
 "업��트할 수 없는 로컬 레�런스가 있습니다. 과거 충� 브랜치를\n"
 " 제거하려면 'git remote prune %s' 명령� 실행해 보십시오"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s 레�런스가 연결� �어지게 �니다)"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s 레�런스가 연결� �어졌습니다)"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[삭제�]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(없�)"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "간략한 저장소가 아닌 저장소� 현재 %s 브랜치로 가져오기를 거절합니다"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "\"%s\" 옵션� \"%s\" 값� %s� 대해 올바르지 않습니다"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "\"%s\" 옵션� '%s'� 대해 무시�니다\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "%s�(를) 가져오는 중\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "%s�(를) 가져올 수 없습니다"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"--filter 옵션� core.partialClone� 설정� 리모트 저장소�만 사용할 수 있습니"
+"다"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8376,41 +8571,41 @@ msgstr ""
 "리모트 저장소를 지정하지 않았습니다. 새 리비전� 가져올 수 있는\n"
 "URL�나 리모트 �름� 지정하십시오."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "태그 �름� 지정해야 합니다."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen 옵션� �수 깊�는 지�하지 않습니다"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
-msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다"
+msgstr "--deepen, --depth 옵션 중 하나만 쓸 수 있습니다"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth � --unshallow 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 "완전한 저장소� 대해 --unshallow 옵션� 사용하는 건 앞뒤가 맞지 않습니다"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 명령� 저장소 ��가 없습니다"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 명령� 레�런스명세 ��와 같� 쓰면 앞뒤가 맞지 않습니다"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "그런 리모트나 리모트 그룹� 없습니다: %s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "그룹� 가져오고 레�런스명세를 지정하면 앞뒤가 맞지 않습니다"
 
@@ -8476,7 +8671,7 @@ msgstr "티�� �합하게 플레�스홀�를 �용합니다"
 msgid "show only <n> matched refs"
 msgstr "<n>개� 해당하는 레�런스만 표시합니다"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "�맷 색� 유지합니다"
 
@@ -8500,63 +8695,63 @@ msgstr "커밋� 들어 있는 레�런스만 표시합니다"
 msgid "print only refs which don't contain the commit"
 msgstr "커밋� 들어 있지 않� 레�런스만 표시합니다"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "오브�트 디렉터리를 확�하는 중입니다"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<옵션>] [<오브�트>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "접근할 수 없는 오브�트를 표시합니다"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "연결� �어진 오브�트를 표시합니다"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "태그를 알립니다"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "최�위 노드를 알립니다"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "��스 오브�트 헤드 노드를 만듭니다"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "묶�과 보조 오브�트� 만듭니다"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "연결만 확�합니다"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "� 엄격하게 확�합니다"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr ".git/lost-found 안� 연결� �어진 오브�트를 �니다"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "진행 �황� 표시합니다"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "접근할 수 없는 오브�트� �름� �세히 표시합니다"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "오브�트를 확�합니다"
 
@@ -8601,31 +8796,31 @@ msgstr "� �세히 검사합니다 (실행 시간 늘어남)"
 msgid "enable auto-gc mode"
 msgstr "�� 가비지컬렉터 모드를 사용합니다"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr "�미 가비지컬렉터가 실행 중���� 강제로 가비지컬렉터를 실행합니다"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "gc.logexpiry 값� (%s) 파싱하는� 실패했습니다"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "최� 성능� 위해 백그�운드�서 ��으로 저장소� 묶�� 만듭니다.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "최� 성능� 위해 ��으로 저장소� 묶�� 만듭니다.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "수� 관리 작업� \"git help gc\" 내용� 참고하십시오.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8633,7 +8828,7 @@ msgstr ""
 "가비지컬렉터가 �미 '%s' 컴퓨터�서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --"
 "force를 사용하십시오)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8643,12 +8838,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<옵션>] [-e] <패턴> [<리비전>...] [[--] <경로>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: 스레드를 만드는� 실패했습니다: %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "잘못� 스레드 수를 %2$s� 대해 지정했습니다 (%1$d)"
@@ -8657,246 +8852,246 @@ msgstr "잘못� 스레드 수를 %2$s� 대해 지정했습니다 (%1$d)"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "스레드 기능� 없습니다. %s 무시"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "트리를 �� 수 없습니다 (%s)"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "종류가 %s� 오브�트�서 grep� 할 수 없습니다"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "`%c' 옵션�는 숫� 값� 와야 합니다"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "작업 �� 대신� ��스�서 검색합니다"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "깃으로 관리하지 않� 내용�서 찾습니다"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "추��는 파�과 추��지 않는 파� 모��서 검색합니다"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "'.gitignore'로 지정한 파�� 무시합니다"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "� 하위 모듈� 재귀�으로 검색합니다"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "�치하지 않는 줄� 표시합니다"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "대소문� 구별하지 않고 비�합니다"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "단어 경계 부분� 대해서만 패턴� 맞춥니다"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "바�너리 파�� �스트로 처리합니다"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "바�너리 파��서 패턴� 맞추지 않습니다"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "textconv 필터를 사용해 바�너리 파�� 처리합니다"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "최대 <깊�> 단계만� 내려갑니다"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "POSIX 확장 정규�� 사용합니다"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "기본 POSIX 정규�� 사용합니다 (기본값)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "패턴� 고정 문�열로 해�합니다"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "펄과 호환�는 정규�� 사용합니다"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "줄 번호를 표시합니다"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "파� �름� 표시하지 않습니다"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "파� �름� 표시합니다"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "파� �름� 최�위 디렉터리 �대 경로로 표시합니다"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "�치하는 줄� 표시하지 않고 파� �름만 표시합니다"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "--files-with-matches 옵션과 ��"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "�치하지 않는 파�� �름만 표시합니다"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "파� �름 다�� NUL� 출력합니다"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "�치하는 줄� 표시하지 않고 �치하는 수를 표시합니다"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "�치하는 부분� 강조합니다"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "다른 파� 사�� �치하는 부분� 사�� 빈 줄� 출력합니다"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr "같� 파��서 여러 개가 �치하면 파� �름� 한 번만 표시합니다"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "�치하는 부분 앞뒤� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "�치하는 부분 앞� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "�치하는 부분 뒤� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "<n>개� 작업 스레드를 사용합니다"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "-C NUM 옵션� 줄임"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "�치 항목 앞� 함수 �름 줄� 표시합니다"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "들어 있는 함수를 표시합니다"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "파��서 패턴� �습니다"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "<패턴>과 �치"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "-e 옵션으로 지정한 패턴� 결합합니다"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "출력하지 않고 �치하는 항목� exit() �태 번호로 리턴합니다"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr "모든 패턴과 �치하는 파�� �치하는 부분만 표시합니다"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "grep 표현�� 대한 파싱 트리를 표시합니다"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "페�저"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "�치하는 파�� 페�저 프로그램�서 표시합니다"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "grep(1) 실행� 허용합니다 (� 빌드�서는 무시)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "패턴� 지정하지 않았습니다."
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index �는 --untracked 옵션� 리비전과 같� 쓸 수 없습니다"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "리비전� 찾아낼 수 없습니다: %s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "잘못� 스레드 수를 지정했습니다 (%d)"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "스레드 기능� 없습니다. --threads 옵션 무시"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 옵션� 작업 ���서만 �작합니다"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "--recurse-submodules와 같� 지�하지 않는 옵션입니다."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 "--cached �는 --untracked 옵션� --no-index 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard 옵션� 추��는 내용� 대해 쓸 수 없습니다."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "--cached 옵션과 트리를 모� 지정했습니다."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8904,36 +9099,36 @@ msgstr ""
 "git hash-object [-t <종류>] [-w] [--path=<파�> | --no-filters] [--stdin] "
 "[--] <파�>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "종류"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "오브�트 종류"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "오브�트를 오브�트 ��터베�스로 �니다"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "표준 입력�서 오브�트를 �습니다"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "파�� 필터 없� 그대로 저장합니다"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "임�� 쓰레기 ��터를 해시해 ��� 오브�트를 만듭니다 (디버깅용)"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "파�� � 경로�서 온 것처럼 처리합니다"
 
@@ -9065,150 +9260,150 @@ msgstr "'%s' 명령� '%s' 명령� 단축입니다"
 msgid "usage: %s%s"
 msgstr "사용법: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "%s�(를) 열 수 없습니다"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "오브�트 종류가 맞지 않습니다 (%s)"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "예�한 %s 오브�트를 받지 않았습니다"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "%s 오브�트: 예�한 종류 %s, 실제 %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "%d 바�트를 채울 수 없습니다"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "너무 빨리 파�� �남"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "입력� �기 오류"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "있는 바�트보다 � 많� 사용합니다"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "현재 정�� off_t� 비해 묶�� 너무 �니다"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "묶� �기가 최대 허용 �기를 넘었습니다"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "'%s'�(를) 만들 수 없습니다"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "'%s' 묶� 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "묶� 서명� 맞지 않습니다"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "묶�� %<PRIu32> 버전� 지�하지 않습니다"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "묶�� %<PRIuMAX> 오프셋� 잘못� 오브�트가 있습니다: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate가 %d번� 리턴했습니다"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "�타 베�스 오브�트� 대해 오프셋 값� 오버플로우"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "�타 베�스 오프셋� 범위를 벗어났습니다"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "알 수 없는 오브�트 종류 %d번"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "묶� 파�� 대해 pread를 할 수 없습니다"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "묶� 파�� 너무 �� �남. %<PRIuMAX> 바�트 부족"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "심�한 inflate 부조화"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 충�� %s�서 발견�었습니다!"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "%s�(를) �� 수 없습니다"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "기존 %s 오브�트 정보를 �� 수 없습니다"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "기존 %s 오브�트를 �� 수 없습니다"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "잘못� 블롭 오브�트 %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "잘못� %s"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "오브�트� 오류"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s� 모든 하위 오브�트� 접근할 수 없습니다"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "�타를 �용하는� 실패했습니다"
 
@@ -9276,75 +9471,79 @@ msgstr "추가한 오브�트를 deflate할 수 없습니다 (%d)"
 msgid "local object %s is corrupt"
 msgstr "%s 로컬 오브�트가 ���었습니다"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "묶� 파�� 닫는� 오류"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "'%s' 묶�파� �름� '.pack'으로 �나지 않습니다"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "'%s' 보존 파�� 쓸 수 없습니다"
+msgid "cannot write %s file '%s'"
+msgstr "%s 파�� 쓸 수 없습니다 '%s'"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "쓴 '%s' 보존 파�� 닫지 못했습니다"
+msgid "cannot close written %s file '%s'"
+msgstr "쓴 %s파�� 닫� 수 없습니다 '%s'"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "묶� 파�� 닫는� 오류"
+
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "묶� 파�� 저장할 수 없습니다"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "��스 파�� 저장할 수 없습니다"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "잘못� pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "기존 '%s' 묶� 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "'%s'� 대한 기존 묶� idx 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "�타 아님: 오브�트 %d개"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "체� 길� = %d: 오브�트 %lu개"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "'%s' 묶�파� �름� '.pack'으로 �나지 않습니다"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "현재 디렉터리로 �아올 수 없습니다"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "잘못� %s"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 옵션� --stdin 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin 옵션� 깃 저장소가 필요합니다"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "--verify 옵션� 묶�파� �름� 지정하지 않았습니다"
 
@@ -9528,120 +9727,120 @@ msgstr "--trailer 옵션과 --only-input 옵션� 앞뒤가 맞지 않습니다
 msgid "no input file given for in-place editing"
 msgstr "파� �접 편집� 입력 파�� 지정하지 않았습니다"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<옵션>] [<리비전-범위>] [[--] <경로>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<옵션>] <오브�트>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "잘못� --decorate 옵션: %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "diff를 출력하지 않습니다"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "소스를 표시합니다"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "메� 맵 파�� 사용합니다"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "<패턴>과 �치하는 레�런스만 꾸밉니다"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "<패턴>과 �치하는 레�런스를 꾸미지 않습니다"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "꾸미기 옵션"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "파��서 n,m 범위� 줄� 처리합니다 (1부터 시작)"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "최종 출력: %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 잘못� 파�"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "%s 오브�트를 �� 수 없습니다"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "알 수 없는 종류: %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers 설정� 값� 없�"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "출력 디렉터리� �름� 너무 �니다"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "%s 패치 파�� 열 수 없습니다"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "정확히 하나� 범위가 필요합니다."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "범위가 아닙니다."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "커버레터는 전�메� 형��어야 합니다"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "정신나간 in-reply-to 헤�: %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<옵션>] [<시작시�> | <리비전-범위>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "출력 디렉터리가 �개?"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "알 수 없는 커밋 %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "'%s'�(를) 올바른 레�런스로 알아내는� 실패했습니다."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "정확한 병합 기준�� 찾� 수 없습니다."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9652,226 +9851,226 @@ msgstr ""
 "아니면 �접 '--base=<기준�-커밋-ID>' 옵션으로 기준� 커밋� 지정할\n"
 "수� 있습니다."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "정확한 병합 기준�� 찾는� 실패했습니다"
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "기준� 커밋� 리비전 목�� �위 커밋�어야 합니다"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "기준� 커밋� 리비전 목�� 들어 있으면 안 �니다"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "패치 ID를 알아낼 수 없습니다"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "하나� 패치� 대해서� [PATCh n/m]� 붙입니다"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "여러 개 패치� 대해서� [PATCH]를 붙입니다"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "패치를 표준 출력으로 표시합니다"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "커버레터를 만듭니다"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "출력 파� �름� 간단한 �련 번호를 사용합니다"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "확장�"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "'.patch' 대신 <확장�>를 사용합니다"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "패치 번호를 1 대신 <n>�서 시작합니다"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "시리즈를 N번째 re-roll로 표시합니다"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "[PATCH] 대신 [RFC PATCH]를 사용합니다"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[PATCH] 대신 [<접�어>]를 사용합니다"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "결과 파�� <디렉터리>� 저장합니다"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH]를 �르거나 추가하지 않습니다"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "바�너리 diff를 만들지 않습니다"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "From 헤��서 모� 0� 해시를 출력합니다"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "업스트림� 있는 패치를 �함하지 않습니다"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "기본값 (패치 + 통계) 대신 패치 형�� 표시합니다"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "메시징"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "헤�"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "전�메� 헤�"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "전�메�"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "To: 헤�를 추가합니다"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "Cc: 헤�를 추가합니다"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "신�"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "<신�>�서 From 주소를 설정합니다 (없으면 커미터 주소 신� 사용)"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "메시지-ID"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "첫 메�� <메시지-ID>� 대한 답장 메�로 만듭니다"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "경계"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "패치를 첨부합니다"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "패치를 본문� �함합니다"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "메시지� 스레드를 사용, 스타�: shallow, deep"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "서명"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "서명� 추가합니다"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "베�스-커밋"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "전제조건 트리 정보를 패치 시리즈� 추가합니다"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "파��서 서명� 추가합니다"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "패치 파� �름� 표시하지 않습니다"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "패치를 만드는 �안 진행률� 표시합니다"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "잘못� 신� 줄: %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "-n � -k 옵션� 하나만 �야 합니다."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc � -k 옵션� 하나만 �야 합니다."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "--name-only 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "--name-status 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "--check 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "표준 출력�나 디렉터리 중� 하나만 지정해야 합니다."
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "'%s' 디렉터리를 만들 수 없습니다"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "'%s' 서명 파�� �� 수 없습니다"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "패치 �성"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "출력 파�� 만드는� 실패했습니다"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10025,7 +10224,7 @@ msgstr "url.<베�스>.insteadOf 설정� 고려합니다"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "해당하는 레�런스가 없으면 코드 2번으로 �냅니다"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "레�런스와 레�런스가 가리키는 오브�트를 표시합니다"
 
@@ -10070,181 +10269,181 @@ msgstr "전체 트리 목� 표시, 현재 디렉터리만 아니� (--full-na
 msgid "empty mbox: '%s'"
 msgstr "빈 mbox: '%s'"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<옵션>] [<커밋>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "`m' 옵션�는 값� 필요합니다"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "'%s' 병합 전략� 찾� 수 없습니다.\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "사용 가능한 전략�:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "사용 가능한 사용� 설정 전략�:"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "병합� �날 때 diffstat� 표시하지 않습니다"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "병합� �날 때 diffstat� 표시합니다"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(--stat 옵션과 ��)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "병합 커밋� 메시지� shortlog 항목� (최대 <n>개) 추가합니다"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "병합하는 대신 하나� 커밋� 만듭니다"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "병합� 성공하면 커밋� 합니다 (기본값)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "커밋 전� 메시지를 편집합니다"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "정방향 진행� 허용합니다 (기본값)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "정방향 진행� 불가능하면 중지합니다"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "지정한 커밋� 올바른 GPG 서명� 있는지 검�합니다"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "ì „ëžµ"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "사용할 병합 전략"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "옵션=값"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "선�한 병합 전략� 대한 옵션"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "병합 커밋 메시지 (정방향� 아닌 병합� 대해)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "현재 진행 중� 병합� 중지합니다"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "현재 진행 중� 병합� 계�합니다"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "관계 없는 커밋 내역� 병합� 허용합니다"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "커밋 메시지 후�를 검�합니다"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "stash를 실행할 수 없습니다."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "스태시 실패"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "올바른 오브�트가 아닙니다: %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "read-tree 실패"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (합칠 내용� 없습니다)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "커밋 합치기 -- HEAD를 업��트하지 않습니다\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "병합 메시지가 없습니다 -- HEAD를 업��트하지 않습니다\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s'�(가) 커밋� 가리키지 않습니다"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "잘못� branch.%s.mergeoptions 문�열: %s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "� 개� 헤드 병합 외�는 처리하지 않습니다."
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive� 대해 알 수 없는 옵션: -X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "%s� 쓸 수 없습니다"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "'%s'�서 �� 수 없습니다"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "병합� 커밋하지 않습니다. 병합� 마치려면 'git commit'� 사용하십시오.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10260,68 +10459,68 @@ msgstr ""
 "'%c' 문�로 시작하는 줄� 무시�고, 메시지가 비어 있으면 커밋�\n"
 "중지합니다.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "빈 커밋 메시지."
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "훌륭합니다.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�� 병합� 실패했습니다. 충�� 바로잡고 결과물� 커밋하십시오.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "현재 브랜치가 없습니다."
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "현재 브랜치� 대한 리모트가 없습니다."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "현재 브랜치� 대해 기본 업스트림� 지정하지 않았습니다."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "리모트 %2$s�서 %1$s� 대한 리모트 추� 브랜치가 없습니다"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "잘못� 값 '%s', 환경 '%s'"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "%s 안�서 병합할 수 있는 항목� 아닙니다: %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "병합할 수 있는 항목� 아닙니다"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort 옵션� ��를 받지 않습니다"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "중지할 병합 작업� 없습니다. (MERGE_HEAD가 없�)"
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue 옵션� ��를 받지 않습니다"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "진행 중� 병합 작업� 없습니다. (MERGE_HEAD가 없�)"
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10329,7 +10528,7 @@ msgstr ""
 "병합� 마치지 않았습니다. (MERGE_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10337,112 +10536,112 @@ msgstr ""
 "커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있�)"
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "--squash 옵션� --no-ff 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "커밋� 지정하지 않았고  merge.defaultToUpstream를 설정하지 않았습니다."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "빈 헤드로 커밋� 합치기는 지�하지 않습니다"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "정방향� 아닌 커밋� 빈 헤드�서는 앞뒤가 맞지 않습니다"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 병합할 수 있는 항목� 아닙니다"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "빈 헤드�는 정확히 하나� 커밋만 병합할 수 있습니다"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "%s 커밋� 신뢰하지 않는 (서명�가 %s�고 하는) GPG 서명� 있습니다."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "%s 커밋� 잘못� (서명�가 %s�고 하는) GPG 서명� 있습니다."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "%s 커밋� GPG 서명� 없습니다."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "%s 커밋� %s� 올바른 GPG 서명� 없습니다\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "관계 없는 커밋 내역� 병합� 거부합니다"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "�미 업��트 �태입니다."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "업��트 중 %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "아주 간단한 ��스 내부 병합� 시�합니다...\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "아님.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "�미 업��트 �태입니다. 야호!"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "정방향� 불가능하므로, 중지합니다."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "트리를 본래 위치로 ��립니다...\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "병합 전략 %s 시�...\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "병합� 처리한 전략� 없습니다.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "전략 %s(으)로 병합� 실패했습니다.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "수� 해결� 준비를 위해 %s 전략� 사용합니다.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "�� 병합� 잘 진행�었습니다. 요청한대로 커밋 전� 중지합니다\n"
@@ -10595,72 +10794,72 @@ msgstr "%.*s�(가) ��스� 있습니다"
 msgid "force move/rename even if target exists"
 msgstr "대�� �미 있어� 강제로 옮기기/�름 바꾸기를 합니다"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "옮기기/�름 바꾸기 오류를 건너 �니다"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "대�� ('%s') 디렉터리가 아닙니다"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "'%s'�(를) '%s'(으)로 �름 바꾸기합니다\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "잘못� �본"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "디렉터리를 �기 �신으로 옮길 수 없습니다"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "디렉터리를 파�로 옮길 수 없습니다"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "�본 디렉터리가 비어 있습니다"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "버전 컨트롤 중� 아닙니다"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "대�� 있습니다"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "'%s' �어쓰기"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "�어쓸 수 없습니다"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "��한 대�� 대해 여러 개 �본"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "대� 디렉터리가 없습니다"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, �본=%s, 대�=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�름 바꾸기, '%s'�서 '%s'(으)로\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "'%s'� �름 바꾸기가 실패했습니다"
@@ -10851,12 +11050,12 @@ msgstr "노트 오브�트를 쓸 수 없습니다"
 msgid "the note contents have been left in %s"
 msgstr "노트 내용� %s� 남습니다"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "'%s'�(를) �� 수 없습니다"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "'%s'�(를) 열거나 �� 수 없습니다"
@@ -11101,7 +11300,7 @@ msgstr "없는 노트를 제거하려는 ì‹œë�„를 오류가 ì•„ë‹Œ 것으로 ì·
 msgid "read object names from the standard input"
 msgstr "표준 입력�서 오브�트 �름� �습니다"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "제거하지 않고, 보여주기만 합니다"
 
@@ -11135,184 +11334,188 @@ msgstr ""
 "git pack-objects [<옵션>...] <베�스�름> [< <레�런스목�> | < <오브�트목�"
 ">]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "deflate 오류 (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "배트맵 쓰기를 하지 않습니다. 묶�� pack.packSizeLimit 값� 따� 쪼개집니다"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "오브�트 쓰는 중"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "묶�� 들어있지 않� 오브�트가 있으므로, 비트맵 쓰기를 하지 않습니다"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "오브�트 압축하는 중"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "--missing� 값� 올바르지 않습니다"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "지�하지 않는 ��스 버전 %s"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "잘못� ��스 버전 '%s'"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "진행률� 표시하지 않습니다"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "진행률� 표시합니다"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "오브�트 쓰기 단계�서 진행률� 표시합니다"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "진행률� 표시� 때 --all-progress와 비슷합니다"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "버전[,오프셋]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr "지정한 버전� ��스 형�� 따� 묶� ��스 파�� �니다"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "출력 묶� 파�� 최대 �기"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "보조 오브�트 저장소�서 빌려온 오브�트를 무시합니다"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "묶� 오브�트를 무시합니다"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "묶� 윈�우를 오브�트 단위로 제한합니다"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr "묶� 윈�우를 오브�트 단위� 추가로 메모리 단위로 제한합니다"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "결과물 묶��서 허용�는 최대 길�� �타 체�"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "기존 �타를 재사용합니다"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "기존 오브�트를 재사용합니다"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA 오브�트를 사용합니다"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr "최�� �타 �치를 검색하는� 스레드를 사용합니다"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "빈 묶� 출력� 만들지 않습니다"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "표준 입력�서 리비전 ��를 �습니다"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "묶지 않는 오브�트 수를 제한합니다"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "모든 레�런스�서 접근 가능한 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "reflog 항목�서 레�런스할 수 있는 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "��스�서< 레�런스하는 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "묶�� 표준 출력으로 출력합니다"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "묶�� 들어갈 오브�트를 레�런스하는 태그 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "접근 불가능 오브�트를 보존합니다"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "�슨한 접근 불가능 오브�트를 묶습니다"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "<시�>보다 새로운 접근 불가능 오브�트� 묶�� 풉니다"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "얇� 묶�� 만듭니다"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "얕� 가져오기� �합한 묶�� 만듭니다"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "해당하는 .keep 파�� 있는 묶�� 무시합니다"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "묶� 압축 단계"
 
 # FIXME: graft?
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "붙어 있는 커밋� 숨기지 않습니다"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "가능하면 비트맵 ��스를 사용해 오브�트 세기 ��를 높입니다"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "묶� ��스와 같� 비트맵 ��스를 �니다"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "없는 오브�트를 처리합니다"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "프�미서 묶� 파�� 오브�트를 묶지 않습니다"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "오브�트 개수 세는 중"
 
@@ -11340,15 +11543,19 @@ msgstr "중복� 오브�트 제거"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <시�>] [--] [<헤드>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "잘�낸 오브�트를 알립니다"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "<시�>보다 오래 � 오브�트를 만료합니다"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "프�미서 묶�파� 밖�서 오브�트 찾지 않습니다"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "precious-objects 저장소�서 잘�낼 수 없습니다"
 
@@ -11445,7 +11652,7 @@ msgstr "�세한 정보는 git-pull(1) 페�지를 참고하십시오."
 msgid "<remote>"
 msgstr "<리모트>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<브랜치>"
@@ -11468,27 +11675,27 @@ msgstr ""
 "설정�서 리모트� '%s' 레�런스와 병합하�� 지정했지만,\n"
 "그런 레�런스를 가져오지 않았습니다."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "리베�스� 대해 --verify-signatures 옵션� 무시합니다"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash 옵션� --rebase 옵션과 같� �야 합니다."
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "만들어지지 않� 브랜치를 ��스� 추가� 변경 사항으로 업��트합니다."
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "리베�스로 풀하기"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "커밋하거나 스태시� 넣으십시오."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11499,7 +11706,7 @@ msgstr ""
 "작업 ��를 %s 커밋�서 정방향\n"
 "진행합니다."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11516,15 +11723,15 @@ msgstr ""
 "$ git reset --hard\n"
 "복구�니다."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "여러 브랜치로 리베�스할 수 없습니다."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "로컬�서 기�한 하위 모듈 수정 사항� �용해 리베�스할 수 없습니다"
 
@@ -11709,7 +11916,7 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 "푸시 대�� 설정하지 않았습니다.\n"
-"명령해�서 URL� 지정하거나 다�� 사용해 리모트 저장소를 설정하십시오\n"
+"명령행�서 URL� 지정하거나 다�� 사용해 리모트 저장소를 설정하십시오\n"
 "\n"
 "    git remote add <�름> <URL>\n"
 "\n"
@@ -11908,40 +12115,44 @@ msgstr "git rebase--helper [<옵션>]"
 msgid "keep empty commits"
 msgstr "빈 커밋� 유지합니다"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "빈 메시지로 커밋� 허용합니다"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "리베�스 계�"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "리베�스를 중지합니다"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "리베�스 스�립트를 만듭니다"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "할 � 목�� 커밋 아�디를 줄입니다."
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "할 � 목�� 커밋 아�디를 늘입니다."
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "할 � 목�� 확�합니다"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "불필요한 빼오기를 건너�니다"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "fixup/squash 줄 재구성"
 
 # English Text�서는 insert를 사용하지만, 소스코드�는 add로 표현�어 있습니다.
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "할 � 목�� 실행 명령� 추가합니다"
 
@@ -11949,7 +12160,7 @@ msgstr "할 � 목�� 실행 명령� 추가합니다"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11967,16 +12178,16 @@ msgid ""
 msgstr ""
 "기본값으로 간략한 저장소가 아닌 현재 브랜치� 업��트는 거부�니다.\n"
 "업��트하면 ��스와 작업 트리가 푸시한 내용과 �치하지 않게 �므로,\n"
-"'git reset --hard'로 작업 트리를 HEAD� 맞춰야 합니다.\n"
+"'git reset --hard'로 작업 ��를 HEAD� 맞춰야 합니다.\n"
 "\n"
 "리모트 저장소�서 'receive.denyCurrentBranch' 설정 변수를 'ignore'나\n"
 "'warn'으로 설정하면 현재 브랜치로 푸시할 수 있습니다. 하지만 작업\n"
-"트리� 내용� 푸시할 내용� 맞추는 게 아니�면 추천하지 않습니다.\n"
+"��� 내용� 푸시할 내용� 맞추는 게 아니�면 추천하지 않습니다.\n"
 "\n"
 "� 메시지를 보지 않고 기본 �작� 계� 하려면,\n"
 "'receive.denyCurrentBranch' 설정 변수를 'refuse'로 설정하십시오."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11996,15 +12207,15 @@ msgstr ""
 "\n"
 "� 메시지를 보지 않으려면, � 설정 변수를 'refuse'로 설정하십시오."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "출력 않기"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "디렉터리를 지정해야 합니다."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s'�(는) 올바른 시� 값� 아닙니다"
@@ -12522,88 +12733,88 @@ msgstr ""
 "�진�� repack� 비트맵 ��스와 호환�지 않습니다.\n"
 "--no-write-bitmap-index를 사용하거나 pack.writebitmaps 설정� �십시오."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "하나� 묶� 안� 모� 묶습니다"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "-a와 ��하고, 접근 불가능 오브�트를 �슨하게 바꿉니다"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "여분� 묶�� 제거하고, git-prune-packed를 실행합니다"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "git-pack-objects� --no-reuse-delta 옵션� 넘�니다"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "git-pack-objects� --no-reuse-object 옵션� 넘�니다"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info를 실행하지 않습니다"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "git-pack-objects� --local 옵션� 넘�니다"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "비트맵 ��스를 �니다"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "대략�시�"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "-A� 추가로, 지정한 시�보다 오래� 오브�트를 �슨하게 만들지 않습니다"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "-a와 같�, 접근 불가능 오브�트를 다시 묶습니다"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "�타 압축� 사용할 윈�우 �기"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "바�트수"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "위와 ��하지만, 항목 수 대신 메모리 �기를 제한합니다"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "최대 �타 깊�를 제한합니다"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "최대 스레드 수를 제한합니다"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "묶� 파�� 최대 �기"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr ".keep으로 표시� 묶�� 오브�트를 다시 묶습니다"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "precious-objects 저장소� 묶�� 삭제할 수 없습니다"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable � -A 옵션� 호환�지 않습니다"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "'%s' 제거� 실패했습니다"
@@ -12686,11 +12897,11 @@ msgstr "커밋� �위 항목� 바꿉니다"
 msgid "replace the ref if it exists"
 msgstr "레�런스가 있으면 대체합니다"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "--edit� 대한 내용� 예�게 표시하지 않습니다"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "� 형�� 사용합니다"
 
@@ -12748,101 +12959,105 @@ msgstr "HEAD� 트리를 찾는� 실패했습니다."
 msgid "Failed to find tree of %s."
 msgstr "%s� 트리를 찾는� 실패했습니다."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD� 현재 위치는 %s입니다"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "병합 중� %s 리셋� 할 수 없습니다."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "간략히 표시, 오류만 표시합니다"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "HEAD와 ��스를 리셋합니다"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "HEAD만 리셋합니다"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, ��스, 작업��를 리셋합니다"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD를 리셋하지만 로컬 변경 사항� 남겨둡니다"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr "제거한 경로를 나중� 추가한다는 사실만 기�합니다"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "'%s'�(를) 올바른 리비전으로 찾는� 실패했습니다."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "'%s'�(를) 올바른 트리로 찾는� 실패했습니다."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 옵션� --{hard,mixed,soft} 옵션과 호환�지 않습니다"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed 옵션� 경로와 같� 쓰기는 제거� 예정입니다. 대신� 'git reset -- <경"
 "로>'를 사용하십시오."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "경로와 같� %s 리셋� 할 수 없습니다."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s 리셋� 간략한 저장소�서만 쓸 수 있습니다"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N 옵션� --mixed 옵션과 같� �야만 합니다"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "리셋 뒤� 스테�징하지 않� 변경 사항:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "��스 파�� '%s' 리비전으로 리셋할 수 없습니다."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "새 ��스 파�� 쓸 수 없습니다."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "--exclude-promisor-objects 옵션과 --missing 옵션� 결합 할 수 없습니다"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "오브�트 필터�� --objects 옵션� 필요합니다"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "잘못� 드문 값 '%s'"
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list는 노트 표시를 지�하지 않습니다"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "--use-bitmap-index 옵션� 오브�트 필터�� 결합 할 수 없습니다"
 
@@ -12947,10 +13162,6 @@ msgstr "커밋 �름� 뒤� 붙입니다"
 msgid "preserve initially empty commits"
 msgstr "최초 빈 커밋� 유지합니다"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "빈 메시지로 커밋� 허용합니다"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "여분� 빈 커밋� 유지합니다"
@@ -13288,35 +13499,39 @@ msgstr "주� 문�로 시작하는 모든 줄� 건너뛰고 제거합니다
 msgid "prepend comment character and space to each line"
 msgstr "� 줄� 앞� 주� 문�와 공백� 붙입니다"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "그런 레�런스가 없습니다: %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "전체 레�런스 �름� 필요하지만, 입력� %s"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote 옵션� ��가 필요하지 않습니다"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "'%s' URL 하나� 단계를 잘�낼 수 없습니다"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "�대 경로� 사용할 �다른 기준"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ".gitmodules�서 하위 모듈 경로 '%s'� 대한 URL� 없습니다"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13324,107 +13539,195 @@ msgid ""
 msgstr ""
 "'%s' 설정� 찾아볼 수 없습니다. � 저장소가 �체 업스트림��고 가정합니다."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "하위 모듈 경로 '%s'� 대한 URL� 등�하는� 실패했습니다"
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "'%3$s' 경로� 대해 '%1$s' (%2$s) 하위 모듈 등�\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "경고: '%s' 하위 모듈� 대해 커맨드 업��트 모드가 제안�었습니다\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "'%s' 하위 모듈� 대해 업��트 모드 등�� 실패했습니다"
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "하위 모듈 초기화� 출력� 하지 않습니다"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<경로>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "경로 '%s'� 대해 .gitmodules� 있는 하위모듈 매핑� 없습니다"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "HEAD 레�런스를 '%s' 하위 모듈 안�서 찾� 수 없습니다"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "'%s' 하위 모듈� 재귀�으로 �용� 실패했습니다"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr "하위 모듈 �태를 출력하지 않습니다"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "하위 모듈 HEAD� 저장� 커밋 대신 ��스� 저장� 커밋� 사용합니다"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "내장� 하위 모듈� 재귀�으로 �용"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<경로>...]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <경로>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "하위 모듈 URL� '%s'� 대해 �기화\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "하위 모듈 경로 '%s'� 대한 URL� 등�하는� 실패했습니다"
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+"하위 모듈 경로 '%s'� 대한 기본 리모트 (저장소)를 가져오는� 실패했습니다"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+"하위 모듈 경로 '%s'� 대한 리모트 (저장소)를 업��트하는� 실패했습니다"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "하위 모듈 URL �기화 출력 표시하지 않습니다"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "중첩� 하위 모듈� 재귀�으로 �용합니다"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<경로>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr "하위 모듈 작업 �� '%s'� .git 디렉터리가 있습니다 (정�로 모든 커밋 내역� �함하여 제거하려면 'rm -rf'를 사용하십시오)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"하위 모듈 작업 �� '%s'� 로컬 수정 사항� 있습니다. 버리려면 '-f'를 사용하"
+"십시오"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "'%s' 디렉터리를 지�니다\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "하위 모듈 작업 ��  '%s'�(를) 제거할 수 없습니다\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "빈 하위 모듈 디렉터리를 %s�(를) 만들 수 없습니다"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "'%s' 하위 모듈� (%s) '%s' 경로� 대해 등��지 않았습니다\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "로컬 변경 사항� 있어� 하위 모듈 작업 ��를 제거합니다"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "모든 하위 모듈� 목��서 제거합니다"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<경로>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "정�로 모든 하위 모듈 초기화를 해제하려면 '--all'� 사용하십시오"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "'%s' 하위 모듈� 보조 오브�트를 추가할 수 없습니다: %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "submodule.alternateErrorStrategy� 대한 값�('%s') 알 수 없는 값입니다"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "submodule.alternateLocation� 대한 값�('%s') 알 수 없는 값입니다"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "새 하위 모듈� 복제할 대� 위치"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "새 하위 모듈 �름"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "하위 모듈� 복제해 올 URL"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "얕� 복제� 사용할 깊�"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "복제 진행 �황� 항� 표시합니다"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13432,82 +13735,82 @@ msgstr ""
 "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
 ">] [--name <�름>] [--depth <깊�>] --url <url> --path <경로>"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "'%s'�서 하위 모듈 경로 '%s'� 복제하는� 실패했습니다"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "'%s'� 대한 하위 모듈 디렉터리를 가져올 수 없습니다"
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "'%s' 하위 모듈 경로가 초기화�지 않았습니다"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "'update --init'� 하려고 한 것 아니었습니까?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "병합하지 하위 모듈 %s 건너뜀"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "하위 모듈 '%s' 건너뜀"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "'%s' 복제하는� 실패했습니다. 재시� 예정"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "�번째 '%s' 복제하는� 실패했습니다. 중지합니다"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "작업 ��로 가는 경로"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "작업 ��로 가는 경로, 내장� 하위 모듈� 경계 통과"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout �는 none"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "지정한 개수� 리비전�서 잘린 얕� 복제를 만듭니다"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "병렬 작업 개수"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "최초 복제가 얕� 복제 추천� 따를지 여부"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "복제 과정� 표시하지 않습니다"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "파�미터 업��트� 값� 잘못�었습니다"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13516,20 +13819,20 @@ msgstr ""
 "하위 모듈 (%s) 브랜치가 �위 프로�트 브랜치를 �어받�� 설정�었지만, �위 "
 "프로�트� 브랜치가 없습니다"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "하위 모듈� 재귀�으로 �용"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<경로>...]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s�서 --super-prefix 옵션� 지�하지 않습니다"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s'�(는) 올바른 submodule--helper 하위 명령� 아닙니다"
@@ -13633,139 +13936,143 @@ msgstr "태그� 서명할 수 없습니다"
 msgid "unable to write tag file"
 msgstr "태그 파�� 쓸 수 없습니다"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "잘못� 오브�트 종류."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "태그 메시지 없�?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "태그 메시지가 %s 파�� 남아 있습니다\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "태그 �름 목�� 표시합니다"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "� 태그 메시지� <n>줄� 표시합니다"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "태그를 삭제합니다"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "태그를 검�합니다"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "태그 만들기 옵션"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "주� 달린 태그, 메시지가 필요합니다"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "태그 메시지"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "강제로 태그 메시지를 편집합니다"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "주� 달리고 GPG 서명한 태그"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "태그를 서명하는� 지정한 키를 사용합니다"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "태그가 있으면 바꿉니다"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "reflog를 만듭니다"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "태그 목� 보기 옵션"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "태그 목�� 여러 열로 표시합니다"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "해당 커밋� 들어 있는 태그만 표시합니다"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "해당 커밋� 들어 있지 않� 태그만 표시합니다"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "병합� 태그만 표시합니다"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "병합�지 않� 태그만 표시합니다"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "해당 오브�트� 태그만 표시합니다"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column � -n 옵션� 호환�지 않습니다"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "-n 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged � --no-merged 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "하나� -F �는 -m 옵션만 쓸 수 있습니다."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "파�미터가 너무 많습니다"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s'�(는) 올바른 태그 �름� 아닙니다."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "태그 '%s'�(가) �미 있습니다"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "태그 '%s' 업��트 (과거 %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "오브�트 묶� 푸는 중"
 
@@ -13777,7 +14084,7 @@ msgstr "%s 디렉터리 만들기 실패했습니다"
 #: builtin/update-index.c:88
 #, c-format
 msgid "failed to stat %s"
-msgstr "%s� stat()하는� 실패했습니다"
+msgstr "%s� 대해 stat()� 실패했습니다"
 
 #: builtin/update-index.c:98
 #, c-format
@@ -13797,7 +14104,7 @@ msgstr "%s 디렉터리를 삭제하는� 실패했습니다"
 #: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
-msgstr "'%s' 안� 수정 시�� 확�하는 중입니다"
+msgstr "'%s' 안� 수정 시�� 확�하는 중입니다 "
 
 #: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
@@ -13958,8 +14265,8 @@ msgstr "파� 시스템 모니터를 켜거나 �니다"
 
 #: builtin/update-index.c:1026
 msgid "mark files as fsmonitor valid"
-msgstr "파� 시스템 모니터� 기능� 변경사항� 확�하는 비트를 파�� 표시합니"
-"다"
+msgstr ""
+"파� 시스템 모니터� 기능� 변경사항� 확�하는 비트를 파�� 표시합니다"
 
 #: builtin/update-index.c:1029
 msgid "clear fsmonitor valid bit"
@@ -14096,8 +14403,8 @@ msgid "print tag contents"
 msgstr "태그 내용 표시"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<옵션>] <경로> [<브랜치>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<옵션>] <경로> [<커밋-따위>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14108,29 +14415,37 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<옵션>] <경로>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <작업트리> <새-경로>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<옵션>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<옵션>] <작업트리>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <경로>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "worktrees/%s 제거: gitdir 파�� 없습니다"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "worktrees/%s 제거: gitdir 파�� �� 수 없습니다 (%s)"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -14139,103 +14454,180 @@ msgstr ""
 "작업 트리 제거/%s: 부족하게 �� (%<PRIuMAX> 바�트 예�, %<PRIuMAX> 바�트 "
 "��)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "worktrees/%s 제거: gitdir 파�� 올바르지 않습니다"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "worktrees/%s 제거: gitdir 파�� 없는 위치를 가리킵니다"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "잘�낸 작업 ��를 알립니다"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "<시�>보다 오래 � 작업 ��를 만료합니다"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s'�(가) �미 있습니다"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "'%s'� 디렉터리를 만들 수 없습니다"
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "%s 준비 중 (ID %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "다른 작업 ���서 체�아웃했��� <브랜치>를 체�아웃합니다"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "새 브랜치를 만듭니다"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "브랜치를 만들거나 리셋합니다"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "새 작업 ��를 만듭니다"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "새 작업 ��를 잠궈 둡니다"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "추� 모드를 설정합니다 (git-branch(1) 참고)"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "새 브랜치 �름과 리모트 추� 브랜치를 �치 시킵니다"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track 옵션� 새로운 브런치가 �성�었� 경우�만 쓸 수 있습니다"
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "잠그는 �유"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s'�(는) 작업 ��가 아닙니다"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "메� 작업 ��를 잠그거나 잠금 해제할 수 없습니다"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s'�(는) �미 잠겼습니다. �유: %s"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s'�(는) �미 잠겼습니다"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s'�(는) 잠기지 않았습니다"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "하위 모듈� �함� 작업 ��는 옮기거나 제거할 수 없습니다"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s'�(는) 메� 작업 ��입니다"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "'%s'�서 대� �름� 찾� 수 없습니다"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "타게 '%s'�(가) �미 있습니다"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "잠긴 작업 ��를 옮길 수 없습니다. 잠긴 �유: %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "잠긴 작업 ��를 옮길 수 없습니다"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "유효성 검사� 실패하여, 작업 ��를 옮길 수 없습니다: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "'%s'�(를) '%s'(으)로 옮기는� 실패했습니다"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "'%s'�서 'git status'를 실행하는� 실패했습니다"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s'�(가) 변경 �었습니다,  삭제하려면 --force를 사용하십시오"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "'%s'�서 'git status'를 실행하는� 실패했습니다,  코드 %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "'%s'�(를) 삭제하는� 실패했습니다"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "작업트리� 변경사항� 있��� 강제로 제거합니다"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "잠긴 작업 ��를 제거할 수 없습니다. 잠긴 �유: %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "잠긴 작업 ��를 제거할 수 없습니다"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "유효성 검사� 실패하여, 작업 ��를 제거할 수 없습니다: %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<접�어>/]"
@@ -14252,24 +14644,24 @@ msgstr "하위 디렉터리 <ì ‘ë‘�ì–´>ì—� 대해 트리 오브ì �트를 ì”�니ë
 msgid "only useful for debugging"
 msgstr "디버깅 용�로만 사용"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<옵션>] <디렉터리>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "하나� 요청/�답 �환 뒤� �납니다"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "최초 레�런스 알림 뒤� 즉시 �납니다"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ ��를 시�하지 않습니다."
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "<n>초 �안 반�� 없으면 전송� 중지합니다"
 
@@ -14290,6 +14682,20 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "디버깅 메시지를 표준오류로 출력합니다"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <경로>] [-c <�름>=<값>]\n"
+"           [--exec-path[=<경로>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<경로>] [--work-tree=<경로>] [--namespace=<�름>]\n"
+"           <명령> [<��>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14300,21 +14706,66 @@ msgstr ""
 "목�� 볼 수 있습니다. 특정 하위 명령어나 개�� 대해 �어 보려면 'git help\n"
 "<명령>' �는 'git help <개�>' 명령� 실행하십시오."
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "--git-dir� 대한 주어진 디렉터리가 없습니다\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "--namespace� 대한 주어진 네임 스페�스가 없습니다\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "--work-tree� 대한 주어진 디렉터리가 없습니다\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "--super-prefix� 대한 접�어가 주어지지 않았습니다\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c는 옵션�는 설정 문�열� 와야 합니다\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "-C 옵션� 주어진 디렉터리가 없습니다\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "알 수 없는 옵션: %s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "별칭 '%s'� 확장� 실패했습니다; '%s'�(는) 깃 명령� 아닙니다\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "'%s'�(를) 여는� 실패: %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer� 0보다 작� 값입니다. 기본값 %d"
 
 # HTTP delegation
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "딜리게�션 컨트롤� cURL 7.44.0 앞 버전�서는 지�하지 않습니다"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "공개 키 고정� cURL 7.44.0 앞 버전�서는 지�하지 않습니다"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14325,16 +14776,16 @@ msgstr ""
 "       요청: %s\n"
 " 리다�렉트: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "%s(으)로 리다�렉트"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "��"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "오브�트 필터�"
 
@@ -14442,23 +14893,23 @@ msgstr "작업 �� �태를 표시합니다"
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "태그를 만들거나, 표시하거나, 삭제하거나, GPG 서명� 검�합니다"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "만료-시�"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "아무 �작� 하지 않� (호환용)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "� �세히 표시합니다"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "� 간략히 표시합니다"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "SHA-1 표시� <n>개� 숫�를 사용합니다"
 
@@ -14686,7 +15137,7 @@ msgstr "$pretty_name� 간단한 병합 시�합니다"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "간단한 병합� �작하지 않습니다. �� 병합� 시�합니다."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -14702,41 +15153,41 @@ msgstr ""
 "abort\"\n"
 "명령� 실행하십시오."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "'$head_name' 위치로 �아갈 수 없습니다"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "��스태시 �용."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "\"$stash_sha1\"�(를) 저장할 수 없습니다"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "리베�스 전 후��서 리베�스를 거부했습니다."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "'git am'� 진행 중� 것처럼 보입니다. 리베�스할 수 없습니다."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "리베�스가 진행 중�지 않습니다"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "--edit-todo �작� 대화형 리베�스�서만 사용할 수 있습니다."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14744,7 +15195,7 @@ msgstr ""
 "모든 병합 충�� 편집하고 git add\n"
 "명령으로 해결�었다고 표시해야 합니다"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14765,74 +15216,74 @@ msgstr ""
 "� 명령� 다시 실행하십시오. 중요한 사항� 남아 있� 경우를\n"
 "대비해 여기서 멈춥니다."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "잘못� 업스트림 '$upstream_name'"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 여러 개� 병합 베�스가 있습니다"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 병합 베�스가 없습니다"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "올바른 커밋� 가리키지 않습니다: $onto_name"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "치명� ��: 그런 브랜치/커밋� 없습니다 '$branch_name'"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "�� 스태시를 할 수 없습니다"
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�� 스태시를 만들었습니다: $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "커밋하거나 스태시� 넣으십시오."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD가 최신 �태입니다."
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "현재 브랜치가 ($branch_name) 최신 �태입니다."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD가 최신 �태입니다. 강제 리베�스합니다."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "현재 브랜치가 ($branch_name) 최신 �태입니다. 강제 리베�스합니다."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "변경 사항 '$mb'�서 '$onto'(으)로:"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "작업 사항� 다시 넣기 위해 먼저 헤드를 뒤로 �립니다..."
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
@@ -14901,86 +15352,86 @@ msgstr "현재 �태를 저장할 수 없습니다"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "작업 ��와 $stash_msg ��스 �태를 저장했습니다"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "작업�� 변경 사항� 제거할 수 없습니다"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "알 수 없는 옵션: $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "스태시 항목� 없습니다."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "너무 많� 리비전� 지정했습니다: $REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference�(는) 올바른 레�런스가 아닙니다"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args'�(는) 스태시 커밋� 아닙니다"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args'�(는) 스태시 레�런스가 아닙니다"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "��스를 새로 고칠 수 없습니다"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "병합 �중� 스태시를 �용할 수 없습니다"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "��스� 충�. --index 없� 시�해 보십시오."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "��스 트리를 저장할 수 없습니다"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "스태시 항목�서 추�하지 않는 파�� 복구할 수 없습니다"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "수정한 파�� 스테�지�서 뺄 수 없습니다"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "��스가 스태시�서 빠졌습니다."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr "다시 필요할 때를 대비해 스태시 항목� 보관합니다."
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} 지움 ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: 스태시 항목� 지울 수 없습니다"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "브랜치 �름� 지정하지 않았습니다"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
 
@@ -15074,66 +15525,17 @@ msgstr "'$displaypath' 들어�"
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "'$displaypath'�서 멈춤. 스�립트가 0� 아닌 �태를 리턴함."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "경로명세 � --all 옵션� 호환�지 않습니다"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "정�로 모든 하위 모듈 초기화를 해제하려면 '--all'� 사용하십시오"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"하위 모듈 작업 �� '$displaypath'� .git 디렉터리가 들어 있습니다\n"
-"(정�로 그 커밋 내역까지 �함해 제거하려면 'rm -rf'를 사용하십시오)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"하위 모듈 작업 ��� ('$displaypath') 로컬 수정 사항� 있습니다. 버리려면 '-"
-"f'를 사용하십시오"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "'$displaypath' 디렉터리를 지�니다"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"'$name' 하위 모듈� ($url) '$displaypath' 경로� 대해 등��지 않았습니다"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "하위 모듈 경로�서 ('$displaypath') 현재 리비전� 찾� 수 없습니다"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "하위 모듈 경로 '$sm_path'�서 가져올 수 없습니다"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15142,12 +15544,12 @@ msgstr ""
 "하위 모듈 경로 '$sm_path'�서 현재 ${remote_name}/${branch} 리비전� 찾� 수 "
 "없습니다"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 가져올 수 없습니다"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15156,81 +15558,76 @@ msgstr ""
 "'$displaypath' 하위 모듈 경로�서 가져왔지만, $sha1 커밋� 들어있지 않습니"
 "다. � 커밋� �접 가져오는� 실패했습니다."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1'�(를) 체�아웃할 수 없습니다"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체�아웃"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1'�(를) 리베�스할 수 없습니다"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베�스"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1' 병합할 수 없습니다"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1'�서 병합"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "'$command $sha1' 실행� 하위 모듈 경로 '$displaypath'�서 실패했습니다"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "재귀�으로 하위 모듈 경로 '$displaypath'� 들어가는� 실패했습니다"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "--cached 옵션� --files 옵션과 같� 쓸 수 없습니다"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "예�치 못한 모드 $mod_dst"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  경고: '$display_name'� '$sha1_src' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  경고: '$display_name'� '$sha1_dst' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  경고: '$display_name'� '$sha1_src' � '$sha1_dst' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "하위 모듈 URL� '$displaypath'� 대해 �기화"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15283,7 +15680,7 @@ msgstr ""
 "\n"
 "여기 줄� 제거하면 해당 커밋� 잃어버립니다!\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15302,82 +15699,82 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: 빼오기가 가능한 커밋� 아닙니다"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "잘못� 커밋 �름: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "현재 커밋� 대체 sha1� 쓸 수 없습니다"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "정방향 진행, $sha1 위치로"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "$sha1 위치로 정방향 진행할 수 없습니다"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "HEAD를 $first_parent 위치로 옮길 수 없습니다"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "병합 squash 거부: $sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "$sha1 병합� 다시 하는� 오류"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "$sha1� 빼오기 할 수 없습니다"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "커밋 메시지 #${n}번입니다:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "#${n}번째 커밋 메시지를 건너�니다:"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "커밋 $count개가 섞� 결과입니다."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "$fixup_msg를 쓸 수 없습니다"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "커밋 2개가 섞� 결과입니다."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "다�� �용할(apply) 수 없습니다: $sha1... $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15390,31 +15787,31 @@ msgstr ""
 "대부분� 경우 빈 커밋 메시지 때문�거나, �는 커밋 전 후�가 실패했기\n"
 "때문입니다. 커밋 메시지를 수정하기 전� � 문제를 먼저 해결해야 합니다."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "다��서 멈춥니다: $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "�전 커밋 없� '$squash_style' 수행할 수 없습니다"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "실행 중: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "실행 실패: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "그리고 ��스 그리고/�는 작업 ��� 변경 사항� 있습니다"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15425,7 +15822,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15440,29 +15837,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "알 수 없는 명령: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "성공�으로 리베�스했고 $head_name 업��트했습니다."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "HEAD는 분리할 수 없습니다"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15493,11 +15890,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr "커밋� 수정한 작성� 신�� 찾는� 오류"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15505,11 +15902,11 @@ msgstr ""
 "작업 ��� 커밋하지 않� 변경 사항� 있습니다. � 사항� 먼저\n"
 "커밋하고 'git rebase --continue' 명령� 다시 실행하십시오."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "스테�징한 변경 사항� 커밋할 수 없습니다."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15523,43 +15920,43 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "편집기를 실행할 수 없습니다"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "$switch_to를 체�아웃할 수 없습니다"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "HEAD가 없습니다?"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "대화형으로 표시할 수 없습니다."
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "다시 작성� 커밋� 초기화할 수 없습니다"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "할 � 목�� �성할 수 없습니다"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "리베�스 $shortrevisions, $shortonto 위로 (명령 $todocount개)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15569,7 +15966,7 @@ msgstr ""
 "하지만 모� 제거할 경우, 리베�스를 중지합니다.\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "단 빈 커밋� 주� 처리�었습니다."
 
@@ -15703,7 +16100,7 @@ msgstr "추�하지 않는 파� 추가"
 msgid "No untracked files.\n"
 msgstr "추�하지 않는 파� 없�.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15711,7 +16108,7 @@ msgstr ""
 "패치가 깔�하게 �용�면, 편집 부분� 즉시 스테�징으로\n"
 "표시�니다."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15719,7 +16116,7 @@ msgstr ""
 "패치가 깔�하게 �용�면, 편집 부분� 즉시 스태시�\n"
 "표시�니다."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15727,7 +16124,7 @@ msgstr ""
 "패치가 깔�하게 �용�면, 편집 부분� 즉시 스테�징 아님으로\n"
 "표시�니다."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15735,7 +16132,7 @@ msgstr ""
 "패치가 깔�하게 �용�면, 편집 부분� 즉시 �용으로\n"
 "표시�니다."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15743,16 +16140,16 @@ msgstr ""
 "패치가 깔�하게 �용�면, 편집 부분� 즉시 버림으로\n"
 "표시�니다."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "부분 편집 파�� 쓰기용으로 여는� 실패: '%s'"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "수� 부분 편집 모드 -- 빠른 설명� 맨 아래를 보십시오.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -15766,7 +16163,7 @@ msgstr ""
 "%s(으)로 시작하는 줄� 제거�니다\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15776,7 +16173,7 @@ msgstr ""
 "ìš°,\n"
 "편집� 중단�고 � 부분� 변경�지 않� �태로 남아있게 �니다.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "부분 편집 파�� �기용으로 여는� 실패: '%s'"
@@ -15787,14 +16184,14 @@ msgstr "부분 편집 파�� �기용으로 여는� 실패: '%s'"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "편집한 부분� �용�지 않습니다. 다시 편집하시겠습니까 (\"no\"�고 하면 버립"
 "니다!) [y/n]? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15808,7 +16205,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� 스테�징\n"
 "d - � 부분과 파�� 뒤 부분 모� 스테�징하지 않�"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15822,7 +16219,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� 스태시\n"
 "d - � 부분과 파�� 뒤 부분 모� 스태시하지 않�"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15836,7 +16233,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� 스테�징 해제\n"
 "d - � 부분과 파�� 뒤 부분 모� 스테�징 해제하지 않�"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15850,7 +16247,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� \n"
 "d - � 부분과 파�� 뒤 부분 모� �용하지 않�"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15864,7 +16261,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� 버림\n"
 "d - � 부분과 파�� 뒤 부분 모� 버리지 않�"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15878,7 +16275,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� 버림\n"
 "d - � 부분과 파�� 뒤 부분 모� 버리지 않�"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15892,7 +16289,7 @@ msgstr ""
 "a - � 부분과 파�� 뒤 부분 모� \n"
 "d - � 부분과 파�� 뒤 부분 모� �용하지 않�"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15914,193 +16311,209 @@ msgstr ""
 "e - 현재 부분� 수�으로 편집\n"
 "? - �움� 보기\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "선�한 부분� ��스� �용�지 않습니다!\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "그래� 작업 ��� �용할까요?"
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "아무 것� �용�지 않았습니다.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "병합하지 않� 사항 무시: %s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "바�너리 파�만 바뀌었습니다.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "변경 사항 없�.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "패치 업��트"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경� 스테�징합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "모드 변경� 스테�징합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "삭제를 스테�징합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "삭제를 스테�징합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분 스테�징합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "� 부분 스테�징합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경 스태시합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "모드 변경 스태시합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "삭제 스태시합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "삭제 스태시합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분 스태시합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "� 부분 스태시합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경 스태시 해제합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "모드 변경� 스테�지 해제합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "삭제 스태시 해제합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "삭제를 스테�지 해제합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분 스태시 해제합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "� 부분� 스테�지 해제합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경� ��스� �용합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "모드 변경� ��스� �용합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "삭제를 ��스� �용합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "삭제를 ��스� �용합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분� ��스� �용합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "� 부분� ��스� �용합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경� 작업 ���서 버립니까 [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "모드 변경� 작업 ���서 버립니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "삭제를 작업 ���서 버립니까 [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "삭제를 작업 ���서 버립니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분� 작업 ���서 버립니까 [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "� 부분� 작업 ���서 버립니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경� ��스와 작업 ���서 버립니까 [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "모드 변경� ��스와 작업 ���서 버립니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "삭제를 ��스와 작업 ���서 버립니까 [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "삭제를 ��스와 작업 ���서 버립니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분� ��스와 작업 ���서 버립니까 [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "� 부분� ��스와 작업 ���서 버립니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "모드 변경� ��스와 작업 ��� �용합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "모드 변경� ��스와 작업 ��� �용합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "삭제를 ��스와 작업 ��� �용합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "삭제를 ��스와 작업 ��� �용합니까 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "� 부분� ��스와 작업 ��� �용합니까 [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "� 부분� ��스와 작업 ��� �용합니까 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "��할 부분� 없습니다\n"
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "어� 부분으로 ��합니까 (� 보려면 <ret>)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "어� 부분으로 ��합니까? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "잘못� 번호: '%s'\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "미안합니다. 부분� %d개 밖� 없습니다.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "검색할 부분� 없습니다\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "정규�� 검색합니까?"
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "잘못� 형태� 검색 정규� %s: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "[주어진 패턴� 맞는 부분� 없습니다\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "�전 부분� 없습니다\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "다� 부분� 없습니다\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "미안합니다. � 부분� 분리 할 수 없습니다\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "%d개 부분으로 나눕니다.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "미안합니다. � 부분� 수정할 수 없습니다\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "diff 검토"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16118,85 +16531,92 @@ msgstr ""
 "add untracked - 추��지 않는 파�� 내용� 변경 사항 스테�징 모�� 추가합"
 "니다\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "-- 빠�"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "알 수 없는 --patch 모드: %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "��가 (%s) 잘못�었고, --가 와야 합니다"
 
 # 주�: 초 단위� 경우를 �한다
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "지역 시간대와 GMT� 차�가 분 단위가 아닙니다\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "지역 시� 오프셋� 24시간보다 �거나 작습니다\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "편집기가 비정��으로 �나서, 모� 중지합니다"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 안� 작성 중�었� 중간 버전� 전�메�� 들어 있습니다.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 안� 작성한 전�메�� 들어 있습니다.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 옵션� 다른 옵션과 호환�지 않습니다\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "저장소 밖�서 git format-patch 명령� 실행할 수 없습니다\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"`batch-size`와 `relogin`� 같� 지정해야 합니다 (명령행 �는 설정 옵션)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "알 수 없는 --suppress-cc 필드: '%s'\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "알 수 없는 --confirm 설정: '%s'\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "경고: 따옴표가 있는 sendmail 별칭� 지�하지 않습니다: %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "경고: `:include:`는 지�하지 않습니다: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "경고: `/file` �는 `|pipe` 리다�렉션� 지�하지 않습니다: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "경고: sendmail 줄� ���지 않습니다: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16211,12 +16631,12 @@ msgstr ""
 "    * 파�� ��했다면 \"./%s\"(�)�고 쓰고, 아니면\n"
 "    * 범위를 ��했다면 --format-patch 옵션 사용\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "%s� opendir 실패: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16225,7 +16645,7 @@ msgstr ""
 "치명� 오류: %s: %s\n"
 "경고: 패치를 보내지 않았습니다\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16235,17 +16655,17 @@ msgstr ""
 "패치 파�� 지정하지 않았습니다\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "%s 안� 제목 줄� 없습니다?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "%s� 쓰려고 여는� 실패: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16259,32 +16679,28 @@ msgstr ""
 "\n"
 "요약� 보내는 게 아니�면 본문 내용� 지우십시오.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "%s.final� 여는� 실패: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "%s�(를) 여는� 실패: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "To/Cc/Bcc 필드가 해��지 않아서, 무시합니다\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "%s.final� 여는� 실패: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "요약 전�메�� 비어 있어서 넘어갑니다.\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "정�로 <%s>�(를) 사용하시겠습니까 [y/N]? "
 
 # 주�: '8bit'��고 그대로 쓴다. 메� encoding 헤�� 쓸 literal� 가리킴
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16292,11 +16708,11 @@ msgstr ""
 "다� 파�� 8bit�지만, Content-Transfer-Encoding� 설정하지 않았습니다.\n"
 
 # 주�: '8bit'��고 그대로 쓴다. 메� encoding 헤�� 쓸 literal� 가리킴
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "어떤 8bit �코딩� 선언합니까 [UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16309,20 +16725,20 @@ msgstr ""
 "제목 서�� '*** SUBJECT HERE ***'가 들어 있습니다. 정�로 보내려면 --force "
 "옵션� 사용하십시오.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "누구�게 전�메�� 보내야 합니까 (보낼 대�� 있다면)?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "치명� 오류: '%s' 별칭� �기 �신� 가리킵니다\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "첫 메�� 대해 (있다면) Message-ID가 In-Reply-To� 사용�었습니다? "
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "오류: 다��서 올바른 주소를 추출할 수 없습니다: %s\n"
@@ -16330,16 +16746,16 @@ msgstr "오류: 다��서 올바른 주소를 추출할 수 없습니다: %s\
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "� 주소로 무엇� 하시겠습니까? ([q]�내기|[d]버리기|[e]편집): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "\"%s\" CA 경로가 없습니다"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16366,134 +16782,153 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "� 전�메�� 보내시겠습니까? ([y]예|[n]아니오|[q]�내기|[a]모�): "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "필요한 전�메� 답장 보냅니다"
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "필요한 SMTP 서버를 제대로 지정하지 않았습니다."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "서버�서 STARTTLS를 지�하지 않습니다! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 실패! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "SMTP를 제대로 초기화할 수 없습니다. 설정� 확�하고 --smtp-debug 옵션� 사용"
 "하십시오."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "%s�(를) 보내는� 실패했습니다\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "%s 보내는 �내\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s 보냄\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "성공 �내. 기��:\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "성공. 기��:\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "ê²°ê³¼: "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "결과: 정�\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "%s 파�� 열 수 없습니다"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) cc: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) to: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox아님) cc: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(본문) cc: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) '%s'� 실행할 수 없습니다"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) %s: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) '%s'(�)를 향한 파�프를 닫는� 실패했습니다"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "메시지를 7비트로 보낼 수 없습니다"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "잘못� 전송 �코딩"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "%s�(를) 열 수 없습니다: %s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: 패치� 998�보다 � 긴 줄� 들어 있습니다"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "%s 넘어�, 예비 확장� '%s' 있�.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "정�로 %s 파�� 보내시겠습니까? [y|N]: "
 
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "잘못� 필터 양� '%s'"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "실패한 패치� 복사본� 다� 위치� 있습니다: %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "경로명세 � --all 옵션� 호환�지 않습니다"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "'$name' 하위 모듈� ($url) '$displaypath' 경로� 대해 등��지 않았습니다"
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr "To/Cc/Bcc 필드가 해��지 않아서, 무시합니다\n"
+
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
 #~ "please use . instead if you meant to match all paths"
diff --git a/po/sv.po b/po/sv.po
index 2dcd3ef..8331e77 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git 2.16.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-09 20:07+0100\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-18 20:55+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar på grund av olöst konflikgt."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
@@ -477,7 +477,7 @@ msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
@@ -553,7 +553,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -611,11 +611,11 @@ msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "sökväg"
@@ -628,7 +628,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "antal"
 
@@ -668,75 +668,75 @@ msgstr "tillämpa en patch utan att röra arbetskatalogen"
 msgid "accept a patch that touches outside the working area"
 msgstr "godta en patch som rör filer utanför arbetskatalogen"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att åtminstone <n> rader sammanhang är lika"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "åtgärd"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "var pratsam"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte på antalet linjer i styckehuvuden"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "rot"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "lägg till <rot> i alla filnamn"
 
@@ -772,7 +772,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "prefix"
 
@@ -780,11 +780,11 @@ msgstr "prefix"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "lägg till prefix till varje sökväg i arkivet"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "fil"
 
@@ -816,8 +816,8 @@ msgstr "komprimera bättre"
 msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "arkiv"
 
@@ -868,22 +868,22 @@ msgstr ""
 "Negativa mönster ignoreras i git-attribut\n"
 "Använd '\\!' för att inleda med ett utropstecken."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Det finns inte mer att göra \"bisect\" på!\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Namnet på incheckningen är inte giltigt: %s"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -892,7 +892,7 @@ msgstr ""
 "Sammanslagningsbasen %s är trasig.\n"
 "Det betyder att felet har rättats mellan %s och [%s].\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -901,7 +901,7 @@ msgstr ""
 "Sammanslagningsbasen %s är ny.\n"
 "Egenskapen har ändrats mellan %s och [%s].\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -910,7 +910,7 @@ msgstr ""
 "Sammanslagningsbasen %s är %s.\n"
 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -921,7 +921,7 @@ msgstr ""
 "git bisect kan inte fungera korrekt i detta fall.\n"
 "Kanske du skrev fel %s- och %s-revisioner?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -938,31 +938,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisect: en sammanslagningsbas måste testas\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "en %s-revision behövs"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen \"%s\""
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "misslyckades läsa bisect-referenser"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s var både %s och %s\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -971,7 +971,7 @@ msgstr ""
 "Ingen testbar incheckning hittades.\n"
 "Kanske du startade med felaktiga sökvägsparametrar?\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -981,47 +981,47 @@ msgstr[1] "(ungefär %d steg)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
 msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents och --reverse fungerar inte så bra tillsammans."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "misslyckades skapa revisionstraversering"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
 "kedjan"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "sökvägen %s i %s finns inte"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kan inte läsa objektet %s för sökvägen %s"
@@ -1179,76 +1179,75 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "okänt huvud: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "kunde inte öppna \"%s\""
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Paketet (bundlen) innehåller denna referens:"
 msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "Paketet (bundlen) beskriver en komplett historik."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Paketet (bundlen) kräver denna referens:"
 msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "Kunde inte starta pack-objects"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "pack-objects misslyckades"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "rev-list dog"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "okänt argument: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "Vägrar skapa ett tomt paket (bundle)."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "index-pack dog"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "felaktigt färgvärde: %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "kunde inte tolka %s"
@@ -1258,7 +1257,7 @@ msgstr "kunde inte tolka %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s är inte en incheckning!"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1371,66 +1370,66 @@ msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
 msgid "bad zlib compression level %d"
 msgstr "felaktigt zlib-komprimeringsgrad %d"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt läge för skapande av objekt: %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "felaktig paketkomprimeringsgrad %d"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Felaktigt %s: \"%s\""
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s har flera värden"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat misslyckades på %s"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "kunde inte ställa in \"%s\" till \"%s\""
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "kunde inte ta bort inställning för \"%s\""
@@ -1453,24 +1452,29 @@ msgstr ""
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "Kontrollerar konnektivitet"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "Kunde inte köra \"git rev-list\""
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "kunde inte skriva till rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "kunde inte stänga rev-list:s standard in"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF skulle ersättas av LF i %s."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1478,12 +1482,12 @@ msgstr ""
 "CRLF kommer att ersättas av LF i %s.\n"
 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF skulle ersättas av LF i %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF skulle ersättas av CRLF i %s"
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1492,11 +1496,6 @@ msgstr ""
 "LF kommer att ersättas av CRLF i %s.\n"
 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF skulle ersättas av CRLF i %s"
-
 #: date.c:116
 msgid "in the future"
 msgstr "i framtiden"
@@ -1611,20 +1610,24 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1633,41 +1636,46 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "kunde inte öppna katalogen \"%s\""
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hämta kärnans namn och information"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "kunde inte skapa kataloger för %s"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
@@ -1686,184 +1694,192 @@ msgstr "Filtrerar innehåll"
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status på filen \"%s\""
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Fjärr utan URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: förväntade grund lista"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "fjärrfel: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc kräver �multi_ack_detailed�"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ogiltig \"shallow\"-rad: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ogiltig \"unshallow\"-rad: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "objektet hittades inte: %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "fel i objekt: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ingen \"shallow\" hittades: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "förväntade shallow/unshallow, fick %s"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "fick %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "ogiltig incheckning %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "ger upp"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "klart"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "fick %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markerar %s som komplett"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "har redan %s (%s)"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "protokollfel: felaktigt packhuvud"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-patch: kunde inte grena av %s"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "fel i sidbands-avmultiplexare"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "Servern stöder inte klienter med grunda arkiv"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "Servern stöder \"multi_ack_detailed\""
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "Servern stöder \"no-done\""
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "Servern stöder \"multi_ack\""
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "Servern stöder \"side-band-64k\""
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "Servern stöder \"side-band\""
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Servern stöder \"allow-tip-sha1-in-want\""
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "Servern stöder \"ofs-delta\""
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Servern stöder filter"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Serverversionen är %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "Servern stöder inte --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "Servern stöder inte --shallow-exclude"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "Servern stöder inte --deepen"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "inga gemensamma incheckningar"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-patch: hämtning misslyckades."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "inget motsvarande fjärrhuvud"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ingen sådan fjärreferens: %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
@@ -1886,17 +1902,18 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte läsa %s"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "misslyckades ta status på \"%s\""
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "\"%s\": kort läsning"
@@ -2039,19 +2056,18 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"
 msgid "name consists only of disallowed characters: %s"
 msgstr "namnet består enbart av ej tillåtna tecken: %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "felaktigt datumformat: %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "flera objektfiltertyper kan inte kombineras"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "flera filterspecifikationer kan inte kombineras"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "ogiltig filterspec-utryck \"%s\""
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "kan inte ändra kontraktsfjärr för delvis kloning"
 
 #: lockfile.c:151
 #, c-format
@@ -2082,8 +2098,8 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"
 msgid "failed to read the cache"
 msgstr "misslyckades läsa cachen"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "kunde inte skriva ny indexfil"
 
@@ -2100,60 +2116,60 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
 msgid "error building trees"
 msgstr "fel vid byggande av träd"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "misslyckades skapa sökvägen \"%s\"%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Tar bort %s för att göra plats för underkatalog\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": kanske en K/F-konflikt?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "vägrar förlora ospårad fil vid \"%s\""
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kan inte läsa objektet %s: \"%s\""
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob förväntades för %s \"%s\""
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "misslyckades öppna \"%s\": %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "misslyckades skapa symboliska länken \"%s\": %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "Misslyckades exekvera intern sammanslagning"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Kunde inte lägga till %s till databasen"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2162,7 +2178,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
 "i trädet."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2171,7 +2187,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
 "%s lämnad i trädet."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2180,7 +2196,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
 "i trädet vid %s."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2189,20 +2205,20 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
 "%s lämnad i trädet vid %s."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "namnbyte"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "namnbytt"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s är en katalog i %s lägger till som %s istället"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2211,140 +2227,140 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (lämnad olöst)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Byter namn på %s till %s och %s till %s istället"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "Lägger till sammanslagen %s"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lägger till som %s istället"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "kan inte läsa objektet %s"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objektet %s är inte en blob"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "ändra"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "ändrad"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "innehåll"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "tillägg/tillägg"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Slår ihop %s automatiskt"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "undermodul"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "fil/katalog"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "katalog/fil"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "Lägger till %s"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "Redan à jour!"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "sammanslagning av träden %s och %s misslyckades"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "Slår ihop:"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "hittade %u gemensam förfader:"
 msgstr[1] "hittade %u gemensamma förfäder:"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "sammanslagningen returnerade ingen incheckning"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "Kunde inte skriva indexet."
 
@@ -2365,16 +2381,16 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
@@ -2383,7 +2399,7 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Felaktigt värde på %s: \"%s\""
@@ -2393,25 +2409,25 @@ msgstr "Felaktigt värde på %s: \"%s\""
 msgid "unable to parse object: %s"
 msgstr "kunde inte tolka objektet: %s"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset före slutet av packfilen (trasig .idx?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset före slutet av packindex för %s (trasigt index?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
@@ -2419,17 +2435,17 @@ msgstr "användning: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-TAL"
 
@@ -2521,7 +2537,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
 msgid "unable to parse --pretty format"
 msgstr "kunde inte tolka format för --pretty"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2530,7 +2546,7 @@ msgstr ""
 "index.version satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2539,22 +2555,22 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "kunde inte stänga \"%s\""
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "kunde inte ta status på \"%s\""
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "kunde inte öppna git-katalog: %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "misslyckades ta bort länken: %s"
@@ -2573,18 +2589,18 @@ msgstr "referensuppdateringar förbjudna i karantänmiljö"
 msgid "could not remove reference %s"
 msgstr "kunde inte ta bort referensen %s"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "kunde inte ta bort referensen %s: %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "kunde inte ta bort referenser: %s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "försvunnen"
 
@@ -2778,128 +2794,138 @@ msgstr "(HEAD frånkopplat från %s)"
 msgid "(no branch)"
 msgstr "(ingen gren)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objektet %s saknas för %s"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer misslyckades på %s för %s"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "felformat objekt vid \"%s\""
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorerar trasig referens %s"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kan inte hämta både %s och %s till %s"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s spårar vanligtvis %s, inte %s"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s spårar både %s och %s"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD pekar inte på en gren"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "okänd gren: \"%s\""
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ingen standarduppström angiven för grenen \"%s\""
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "grenen \"%s\" har ingen fjärr för \"push\""
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "\"enkel push\" motsvarar flera olika mål"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Din gren är à jour med \"%s\".\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (använd \"%s\" för detaljer)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (använd \"git push\" för att publicera dina lokala incheckningar)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2909,11 +2935,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (använd \"git pull\" för att uppdatera din lokala gren)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2928,28 +2954,28 @@ msgstr[1] ""
 "Din gren och \"%s\" har divergerat,\n"
 "och har %d respektive %d olika incheckningar.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent är inkompatibelt med --bisect"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "misslyckades öppna /dev/null"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -2959,24 +2985,28 @@ msgstr ""
 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "kunde inte tolka fjärruppackningsstatus: %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "fjärruppackning misslyckades: %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "misslyckades underteckna push-certifikatet"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "mottagarsidan stöder inte push med --signed"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -2984,32 +3014,37 @@ msgstr ""
 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
 "signed"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "mottagarsidan stöder inte push med --atomic"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "mottagarsidan stöder inte push-flaggor"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Okänd funktion: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3017,7 +3052,7 @@ msgstr ""
 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3027,43 +3062,43 @@ msgstr ""
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
 "och checka in resultatet med \"git commit\""
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "kunde inte låsa \"%s\""
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "kunde inte skriva till \"%s\""
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "kunde inte skriva radslut till \"%s\""
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "misslyckades färdigställa \"%s\"."
+msgid "failed to finalize '%s'"
+msgstr "misslyckades färdigställa \"%s\""
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "dina lokala ändringar skulle skrivas över av %s."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: snabbspola"
@@ -3071,20 +3106,20 @@ msgstr "%s: snabbspola"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "kunde inte bestämma HEAD:s incheckning"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "kan inte uppdatera cacheträd"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3113,17 +3148,124 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "kroken \"prepare-commit-msg\" misslyckades"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
+"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
+"för att redigera din konfigurationsfil:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"När du gjort det kan du rätta identiteten som användes för den här\n"
+"incheckningen med:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
+"\n"
+"    git config --global user.name \"Ditt namn\"\n"
+"    git config --global user.email du@example.com\n"
+"\n"
+"När du gjort det kan du rätta identiteten som användes för den här\n"
+"incheckningen med:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "kunde inte slå upp en precis skapad incheckning"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "kunde inte tolka en precis skapad incheckning"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "frånkopplad HEAD"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (rotincheckning)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "kunde inte tolka HEAD"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s är inte en incheckning!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "kunde inte tolka HEAD:s incheckning"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "kunde inte tolka incheckningens författare"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree misslyckades skriva ett träd"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "kunde inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3134,7 +3276,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3145,242 +3287,246 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Det här är en kombination av %d incheckningar."
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "behöver en HEAD-incheckning att rätta"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "kunde inte läsa HEAD"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kan inte skriva \"%s\""
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "Det här är 1:a incheckningsmeddelandet:"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "kunde inte läsa incheckningsmeddelande för %s"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Det här är incheckningsmeddelande %d:"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Incheckningsmeddelande %d kommer hoppas över:"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "okänt kommando: %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "din indexfil har inte slagits ihop."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "incheckning %s har inte förälder %d"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "kan inte hämta incheckningsmeddelande för %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kan inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "kunde inte byta namn på \"%s\" till \"%s\""
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "kunde inte ångra %s... %s"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "kunde inte tillämpa %s... %s"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "den angivna uppsättningen incheckningar är tom"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: misslyckades läsa indexet"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: misslyckades uppdatera indexet"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s tar inte argument: \"%s\""
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument saknas för %s"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ogiltig rad %d: %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "kunde inte läsa \"%s\"."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "rätta det med \"git rebase --edit-todo\"."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "oanvändbart manus: �%s�"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "inga incheckningar lästes."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "felaktig nyckel: %s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "felaktigt värde för %s: %s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "trasigt manus: �%s�"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "kunde inte låsa HEAD"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "kan inte bestämma HEAD"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "kan inte avbryta från en gren som ännu inte är född"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kan inte öppna \"%s\""
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kan inte läsa \"%s\": %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "oväntat filslut"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Du verkar ha flyttat HEAD.\n"
 "Spolar inte tillbaka, kontrollera HEAD!"
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "kunde inte uppdatera %s"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "kan inte läsa HEAD"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "kunde inte läsa indexet"
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3395,11 +3541,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3416,17 +3562,17 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Tillämpade autostash.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "kan inte spara %s"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3437,57 +3583,52 @@ msgstr ""
 "Dina ändringar är säkra i stashen.\n"
 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Stoppade på %s... %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "okänt kommando %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "kunde inte läsa orig-head"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "kunde inte läsa \"onto\""
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "kunde inte uppdatera %s"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "kunde inte uppdatera HEAD till %s"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "kan inte ombasera: Du har oköade ändringar."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "kan inte lägga till incheckning som inte finns"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ogiltig fil: \"%s\""
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ogiltigt innehåll: \"%s\""
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3497,45 +3638,45 @@ msgstr ""
 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
 "först och kör sedan \"git rebase --continute\" igen."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "kunde inte checka in köade ändringar."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: kan inte göra \"cherry-pick\" på typen �%s�"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "kan inte ångra som första incheckning"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: flaggor som inte stöds"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: fel när revisioner skulle förberedas"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "oanvändbar todo-lista: %s"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3544,7 +3685,7 @@ msgstr ""
 "Varning: vissa incheckningar kan av misstag ha tappats.\n"
 "Tappade incheckningar (nyaste först):\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3564,7 +3705,7 @@ msgstr ""
 "\" (fel).\n"
 "\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3575,21 +3716,26 @@ msgstr ""
 "continue\".\n"
 "Avbryt ombaseringen med \"git rebase --abort\".\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "kunde inte öppna \"%s\" för skrivning"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "kunde inte tolka incheckningen\" %s\""
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "skriptet har redan omordnats."
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "\"%s\" är utanför arkivet"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3612,6 +3758,11 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3623,73 +3774,143 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "funktionen måste köras i en arbetskatalog"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Förväntade git-arkivversion <= %d, hittade %d"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "okända arkivutökningar hittades:"
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
+msgid "error opening '%s'"
+msgstr "fel vid öppning av \"%s\""
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "för stor för att vara en .git-fil: \"%s\""
 
-#: setup.c:1052
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "fel vid läsning av %s"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "ogiltigt gitfilformat: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "ingen sökväg i gitfil: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "inte ett git-arkiv: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "\"$%s\" för stor"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "inte ett git-arkiv: \"%s\""
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "kan inte byta katalog (chdir) till \"%s\""
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "misslyckades ta status på \"%*ss%s%s\""
+
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "Kan inte läsa aktuell arbetskatalog"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "Kan inte byta till \"%s\""
+msgid "cannot change to '%s'"
+msgstr "kan inte byta till \"%s\""
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"Inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
+"inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
 "monteringspunkten %s)\n"
 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
+"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "misslyckades öppna /dev/null eller \"dup\""
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "\"fork\" misslyckades"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "\"setsid\" misslyckades"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "sökvägen \"%s\" finns inte"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "referensarkivet \"%s\" är grunt"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "referensarkivet \"%s\" är ympat"
@@ -3765,7 +3986,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Misslyckades slå upp HEAD som giltig referens."
 
@@ -3789,7 +4010,7 @@ msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
 msgid "submodule '%s' has dirty index"
 msgstr "undermodulen \"%s\" har ett smutsigt index"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3797,18 +4018,18 @@ msgstr ""
 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
 "stöds ej"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3819,20 +4040,20 @@ msgstr ""
 "\"%s\" till\n"
 "\"%s\"\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "kunde inte rekursera in i undermodulen \"%s\""
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "kunde inte starta ls-files i .."
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree returnerade en oväntad returkod %d"
@@ -3910,7 +4131,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ogiltig flagga för depth: �%s�"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3919,7 +4140,7 @@ msgstr ""
 "Följande undermodulsökvägar innehåller ändringar som\n"
 "inte kan hittas av fjärrarna:\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3946,11 +4167,11 @@ msgstr ""
 "för att sända dem till fjärren.\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "Avbryter."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Kunde inte läsa referensen %s"
@@ -3971,7 +4192,7 @@ msgstr "tomt filnamn i trädpost"
 msgid "too-short tree file"
 msgstr "trädfil för kort"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3980,7 +4201,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3989,7 +4210,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3999,7 +4220,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4009,7 +4230,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4018,7 +4239,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4027,7 +4248,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4037,7 +4258,7 @@ msgstr ""
 "dem:\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4046,7 +4267,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4055,7 +4276,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4065,7 +4286,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du slår samman."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4075,7 +4296,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4084,7 +4305,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%sFlytta eller ta bort dem innan du \"%s\"."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4093,7 +4314,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4104,7 +4325,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4115,7 +4336,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4125,7 +4346,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4135,7 +4356,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4144,7 +4365,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
 "%%sFlytta eller ta bort dem innan du \"%s\"."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4153,12 +4374,12 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4167,7 +4388,7 @@ msgstr ""
 "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4178,7 +4399,7 @@ msgstr ""
 "utcheckning:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4189,7 +4410,7 @@ msgstr ""
 "utcheckning:\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4198,12 +4419,12 @@ msgstr ""
 "Kan inte uppdatera undermodul:\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "Avbryter\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "Checkar ut filer"
 
@@ -4236,18 +4457,43 @@ msgstr "felaktigt portnummer"
 msgid "invalid '..' path segment"
 msgstr "felaktigt \"..\"-sökvägssegment"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "misslyckades läsa \"%s\""
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "\"%s\" finns inte"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "\"%s\" är inte en .git-fil, felkod %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "\"%s\" pekar inte tillbaka till \"%s\""
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "kunde inte öppna \"%s\" för läsning"
@@ -4261,155 +4507,155 @@ msgstr "kan inte komma åt \"%s\""
 msgid "unable to get current working directory"
 msgstr "kan inte hämta aktuell arbetskatalog"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "Ej sammanslagna sökvägar:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (använd \"git reset %s <fil>...\" för att ta bort från kö)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (använd \"git add <fil>...\" för att ange lösning)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (använd \"git rm <fil>...\" för att ange lösning)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "Ändringar att checka in:"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Ändringar ej i incheckningskön:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
 "arbetskatalogen)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "borttaget av bägge:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "tillagt av oss:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "borttaget av dem:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "tillagt av dem:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "borttaget av oss:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "tillagt av bägge:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "ändrat av bägge:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "ny fil:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "kopierad:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "borttagen:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "ändrad:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "namnbytt:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "typbyte:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "okänd:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "osammanslagen:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "nya incheckningar, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "ändrat innehåll, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "ospårat innehåll, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Stashen innehåller just nu %d post"
 msgstr[1] "Stashen innehåller just nu %d poster"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Undermodulers ändringar att checka in:"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4417,107 +4663,107 @@ msgstr ""
 "Raden ovan får inte ändras eller tas bort.\n"
 "Allt under den kommer tas bort."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "Du har ej sammanslagna sökvägar."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (använd \"git merge --abort\" för att avbryta sammanslagningen)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "Du är i mitten av en körning av \"git am\"."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "Aktuell patch är tom."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (använd \"git am --abort\" för att återställa ursprungsgrenen)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo saknas."
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "Inga kommandon utförda."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (se fler i filen %s)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "Inga kommandon återstår."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (använd \"git rebase --edit-todo\" för att visa och redigera)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "Du håller på med en ombasering."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git rebase --continue\")"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (använd \"git rebase --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git rebase --continue\")"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4525,126 +4771,126 @@ msgstr ""
 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
 "ovanpå \"%s\"."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Du håller på att dela upp en incheckning i en ombasering."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
 "ovanpå \"%s\"."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "Du håller på att redigera en incheckning under en ombasering."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git cherry-pick --continue\")"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
 "operationen)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Du håller på med att ångra incheckningen %s."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git revert --continue\")"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git revert --continue\")"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (använd \"git revert --abort\" för att avbryta ångrandet)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "Du håller på med en \"bisect\"."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "PÃ¥ grenen "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "interaktiv ombasering pågår; ovanpå "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "ombasering pågår; ovanpå "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "HEAD frånkopplad vid "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "HEAD frånkopplad från "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Inte på någon gren för närvarande."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Första incheckning"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "Inga incheckningar ännu"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "Ospårade filer"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Ignorerade filer"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4656,32 +4902,32 @@ msgstr ""
 "lägga till nya filer själv (se \"git help status\")."
 
 # %s är nästa sträng eller tom.
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ospårade filer visas ej%s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (använd flaggan -u för att visa ospårade filer)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "Inga ändringar"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
 "\")\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "inga ändringar att checka in\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4690,63 +4936,67 @@ msgstr ""
 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
 "\")\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "inget köat för incheckning, men ospårade filer finns\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "inget att checka in\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "inget att checka in, arbetskatalogen ren\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "Inga incheckningar ännu på "
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (ingen gren)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "olika"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "efter "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "före "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "kan inte %s: Du har oköade ändringar."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "misslyckades ta bort länken \"%s\""
@@ -4760,7 +5010,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
@@ -4808,7 +5058,7 @@ msgstr "Kunde inte tillämpa \"%s\""
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4818,7 +5068,7 @@ msgstr "testkörning"
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
@@ -4942,10 +5192,10 @@ msgstr "Inget angivet, inget tillagt.\n"
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Kanske menade du att skriva \"git add .\"?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "indexfilen trasig"
 
@@ -4997,60 +5247,60 @@ msgstr "ogiltig tidszons-offset"
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "När du har löst problemet, kör \"%s --continue\"."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "Patchen är tom."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
 "vägssammanslagning."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Använder indexinfo för att återskapa ett basträd..."
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5058,39 +5308,30 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillämpas på blobbar som antecknats i dess index."
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree misslyckades skriva ett träd"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "kunde inte skriva incheckningsobjekt"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte återuppta: %s finns inte."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -5098,35 +5339,35 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillämpar: %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "En kopia av patchen som misslyckades finns i: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5136,7 +5377,7 @@ msgstr ""
 "Om det inte är något kvar att köa kan det hända att något annat redan\n"
 "introducerat samma ändringar; kanske du bör hoppa över patchen."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5148,17 +5389,17 @@ msgstr ""
 "lösta.\n"
 "Du kan köra �git rm� för att godta �borttagen av dem� för den."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Kan inte tolka objektet �%s�."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5166,133 +5407,141 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Felaktigt värde för --patch-format: %s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "var tyst"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "sänd det genom git-apply"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr "återställ originalgrenen och avbryt patchningen."
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "avbryt patchningen men behåll HEAD där det är."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "visa patchen som tillämpas."
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "nyckel-id"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(används internt av git-rebase)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5300,16 +5549,16 @@ msgstr ""
 "Flaggan -b/--binary har varit utan funktion länge, och\n"
 "kommer tas bort. Vi ber dig att inte använda den längre."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5318,7 +5567,7 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lösningsoperation pågår inte, vi återupptar inte."
 
@@ -5340,8 +5589,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: Fjärr utan URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: förväntade ACK/NAK, fick EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5427,107 +5676,107 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Visa statistik över arbetskostnad"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Tvinga förloppsrapportering"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Visa utdatapoäng för klandringsposter"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "Visa originalfilnamn (Standard: auto)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "Visa ursprungligt radnummer (Standard: av)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Visa i ett format avsett för maskinkonsumtion"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Visa rå tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr "Visa författarens e-post istället för namn (Standard: av)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "Ignorera ändringar i blanksteg"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Använd en experimentell algoritm för att förbättra diffar"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "Slösa extra cykler med att hitta bättre träff"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Använd <fil>s innehåll som slutgiltig bild"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "poäng"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "Hitta kopierade rader inuti och mellan filer"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "Hitta flyttade rader inuti och mellan filer"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "Behandla endast radintervallet n,m, med början på 1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 
@@ -5539,18 +5788,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "4 år, 11 månader sedan"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "filen %s har bara %lu rad"
 msgstr[1] "filen %s har bara %lu rader"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
@@ -5839,17 +6088,17 @@ msgstr "visa endast ej sammanslagna grenar"
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "nyckel"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "fältnamn att sortera på"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "objekt"
 
@@ -5857,16 +6106,16 @@ msgstr "objekt"
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "sortering och filtrering skiljer gemener och VERSALER"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format att använda för utdata"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
@@ -5966,7 +6215,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
 msgid "Need a repository to unbundle."
 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5974,7 +6223,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5982,64 +6231,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<typ> kan vara en av: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "visa objekttyp"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "visa objektstorlek"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "avsluta med noll när det inte uppstått något fel"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "visa objektets innehåll snyggt"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "för blob-objekt, kör filter på objektets innehåll"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "för blob-objekt, kör filger på objektets innehåll"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "använd specifik sökväg för --textconv/--filters"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "buffra utdata från --batch"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr "visa information och innehåll för objekt som listas på standard in"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "visa information för objekt som listas på standard in"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "visa alla objekt med --batch eller --batch-check"
 
@@ -6059,7 +6308,7 @@ msgstr "visa alla attribut som satts på filen"
 msgid "use .gitattributes only from the index"
 msgstr "använd .gitattributes endast från indexet"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "läs filnamn från standard in"
 
@@ -6067,7 +6316,7 @@ msgstr "läs filnamn från standard in"
 msgid "terminate input and output records by a NUL character"
 msgstr "avsluta in- och utdataposter med NUL-tecken"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "undertryck förloppsrapportering"
 
@@ -6079,27 +6328,27 @@ msgstr "visa indatasökvägar som inte träffas"
 msgid "ignore index when checking"
 msgstr "ignorera index vid kontroll"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "kan inte ange sökvägsnamn med --stdin"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z kan endast användas tillsammans med --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "ingen sökväg angavs"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "kan inte använda både --quiet och --verbose"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching är endast giltig med --verbose"
 
@@ -6157,9 +6406,9 @@ msgid "write the content to temporary files"
 msgstr "skriv innehåll till temporära filer"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "sträng"
 
@@ -6204,80 +6453,80 @@ msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
 msgid "path '%s': cannot merge"
 msgstr "sökväg \"%s\": kan inte slå ihop"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "\"%s\" kan inte användas med %s"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "sökvägen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "du måste lösa ditt befintliga index först"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Växlade till och nollställde grenen \"%s\"\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Växlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6300,7 +6549,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6327,161 +6576,161 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "Du är på en gren som ännu inte är född"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "endast en referens förväntades, %d gavs."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen är inte ett träd: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "sökvägar kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "\"%s\" kan inte användas med \"%s\""
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "gren"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "sätt uppströmsinformation för ny gren"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vår version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "utför en 3-vägssammanslagning för den nya grenen"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "konfliktstil (merge eller diff3)"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begränsa inte sökvägar till endast glesa poster"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "tvinga förloppsrapportering"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Grennamn saknas; försök med -b"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "�%s� är inte en incheckning och grenen �%s� kan inte skapas från den"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6581,7 +6830,7 @@ msgstr "Välj poster att ta bort"
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Hej då.\n"
@@ -6604,11 +6853,11 @@ msgstr ""
 "help                - denna skärm\n"
 "?                   - hjälp för kommandoval"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** Kommandon ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "Vad nu"
 
@@ -6638,8 +6887,8 @@ msgstr "städa interaktivt"
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6677,144 +6926,144 @@ msgstr ""
 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "
 "angavs; vägrar städa"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "skapa inte någon utcheckning"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "skapa ett naket (\"bare\") arkiv"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "för att klona från ett lokalt arkiv"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "skapa inte lokala hårda länkar, kopiera alltid"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "skapa som ett delat arkiv"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "sökvägsangivelse"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "initiera undermoduler i klonen"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "antal undermoduler som klonas parallellt"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "mallkatalog"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "katalog att använda mallar från"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "referensarkiv"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "använd --reference endast under kloningen"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "namn"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checka ut <gren> istället för fjärrens HEAD"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "djup"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon på detta djup"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "tid"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "skapa en grund klon från en angiven tidpunkt"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "fördjupa historik för grund klon, exkludera revisionen"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "klonade undermoduler kommer vara grunda"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitkat"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "separera gitkatalogen från arbetskatalogen"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "ställ in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "använd endast IPv4-adresser"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "använd endast IPv6-adresser"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6822,42 +7071,42 @@ msgstr ""
 "Kunde inte gissa katalognamn.\n"
 "Ange en katalog på kommandoraden"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "misslyckades öppna \"%s\""
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och är ingen katalog"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "misslyckades ta status på %s\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa länken \"%s\""
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6867,133 +7116,137 @@ msgstr ""
 "Du kan inspektera det som checkades ut med \"git status\"\n"
 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "fjärren sände inte alla nödvändiga objekt"
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om för att städa upp"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "Du måste ange ett arkiv att klona."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "flaggorna --bare och --origin %s är inkompatibla."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s är inte ett positivt tal"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "kunde inte skapa inledande kataloger för \"%s\""
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 "clone --recursive är inte kompatibel med --reference och --reference-if-able"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "källarkivet är grunt, ignorerar --local"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
@@ -7029,67 +7282,15 @@ msgstr "Spaltfyllnad mellan spalter"
 msgid "--command must be the first argument"
 msgstr "--command måste vara första argument"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<flaggor>] [--] <sökväg>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<flaggor>] [--] <sökväg>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
-"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
-"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
-"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
-"för att redigera din konfigurationsfil:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"När du gjort det kan du rätta identiteten som användes för den här\n"
-"incheckningen med:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
-"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
-"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
-"\n"
-"    git config --global user.name \"Ditt namn\"\n"
-"    git config --global user.email du@example.com\n"
-"\n"
-"När du gjort det kan du rätta identiteten som användes för den här\n"
-"incheckningen med:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7099,7 +7300,7 @@ msgstr ""
 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7113,11 +7314,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Använd annars \"git reset\"\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7133,61 +7334,61 @@ msgstr ""
 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
 "cherry-pick för återstående incheckningar.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporär indexfil"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "interaktiv tilläggning misslyckades"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporärt index"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cacheträdet"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporär indexfil"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar författarhuvud"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7195,38 +7396,38 @@ msgstr ""
 "kunde inte välja ett kommentarstecken som inte använts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slå upp incheckningen %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(läser loggmeddelande från standard in)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "kunde inte läsa logg från standard in"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte läsa loggfilen \"%s\""
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte läsa SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "kunde inte läsa MERGE_MSG"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7241,7 +7442,7 @@ msgstr ""
 "\t%s\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7256,7 +7457,7 @@ msgstr ""
 "\t%s\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7266,7 +7467,7 @@ msgstr ""
 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
 "incheckningen.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7277,143 +7478,147 @@ msgstr ""
 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
 "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFörfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "Kan inte läsa indexet"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ogiltigt ignorerat läge \"%s\""
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ogiltigt läge för ospårade filer: \"%s\""
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "--long och -z är inkompatibla"
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Kan inte använda både --reset-author och --author"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Endast en av -c/-C/-F/--fixup kan användas."
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author kan endast användas med -C, -c eller --amend."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Endast en av --include/--only/--all/--interactive/--patch kan användas."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "Du måste ange sökvägar tillsammans med --include/--only."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt städningsläge %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "Kan inte ange sökvägar med -a."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "beräkna fullständiga före-/efter-värden"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "maskinläsbar utdata"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "visa status i långt format (standard)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "läge"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -7421,11 +7626,11 @@ msgstr ""
 "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
 "traditional)"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7433,210 +7638,186 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "kunde inte slå upp en precis skapad incheckning"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "kunde inte tolka en precis skapad incheckning"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "frånkopplad HEAD"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (rotincheckning)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "läs meddelande från fil"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "meddelande"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "incheckning"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "återanvänd och redigera meddelande från angiven incheckning"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "återanvänd meddelande från angiven incheckning"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "använd autosquash-formaterat meddelande för att slå ihop med angiven "
 "incheckning"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "lägg till Signed-off-by:"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "standard"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "inkludera status i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG-signera incheckning"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "lägg till angivna filer till indexet för incheckning"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "förbigå pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "ok att registrera en ändring med tomt meddelande"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "kunde inte tolka HEAD:s incheckning"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7863,23 +8044,23 @@ msgstr "den annoterade taggen %s har inget inbäddat namn"
 msgid "tag '%s' is really '%s' here"
 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ingen tagg motsvarar \"%s\" exakt"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "avslutade sökning på %s\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7888,7 +8069,7 @@ msgstr ""
 "Inga annoterade taggar kan beskriva \"%s\".\n"
 "Det finns dock oannoterade taggar: testa --tags."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7897,12 +8078,12 @@ msgstr ""
 "Inga taggar kan beskriva \"%s\".\n"
 "Testa --always, eller skapa några taggar."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "traverserade %lu incheckningar\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7911,90 +8092,90 @@ msgstr ""
 "mer än %i taggar hittades; listar de %i senaste\n"
 "gav upp sökningen vid %s\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "beskriva %s\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Objektnamnet är inte giltigt: %s"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s är varken incheckning eller blob"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "hitta taggen som kommer efter incheckningen"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "felsök sökstrategin på standard fel"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "använd alla referenser"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "använd alla taggar, även oannoterade"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "använd alltid långt format"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "följ endast första föräldern"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "skriv endast ut exakta träffar"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "överväg de <n> nyaste taggarna (standard: 10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "överväg endast taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "överväg inte taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "visa förkortade incheckningsobjekt som standard"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "märke"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long är inkompatibel med --abbrev=0"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "Inga namn hittades, kan inte beskriva något."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
 
@@ -8182,95 +8363,100 @@ msgstr "Applicera referensspecifikation på exporterade referenser"
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<flaggor>] <grupp>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "hämta från alla fjärrar"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "sökväg till upload pack på fjärren"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "tvinga överskrivning av lokal gren"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "hämta från flera fjärrar"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "hämta alla taggar och associerade objekt"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "hämta inte alla taggar (--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "rensa fjärrspårande grenar ej längre på fjärren"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hämtning av undermoduler"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "behåll hämtade paket"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "tillåt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "fördjupa historik för grund klon"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "fördjupa historik för grund klon baserad på tid"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "kat"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "lägg till i början av undermodulens sökvägsutdata"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8278,89 +8464,89 @@ msgstr ""
 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "ange referenskarta för \"fetch\""
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "Kunde inte hitta fjärr-referensen HEAD"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[àjour]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "kan inte hämta i aktuell gren"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[uppdaterad tagg]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "kunde inte uppdatera lokal ref"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s sände inte alla nödvändiga objekt\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "avvisa %s då grunda rötter inte kan uppdateras"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "Från %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8369,50 +8555,56 @@ msgstr ""
 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"
 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Flaggan \"%s\" ignoreras för %s\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hämtar %s\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Kunde inte hämta %s"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"--filter kan endast användas med fjärren konfigurerad i core.partialClone"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8420,40 +8612,40 @@ msgstr ""
 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
 "fjärrarkiv som nya incheckningar skall hämtas från."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Du måste ange namnet på en tagg."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negativa djup stöds inte i --deepen"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen och --depth är ömsesidigt uteslutande"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth och --unshallow kan inte användas samtidigt"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow kan inte användas på ett komplett arkiv"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tar inte namnet på ett arkiv som argument"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Fjärren eller fjärrgruppen finns inte: %s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
 
@@ -8520,7 +8712,7 @@ msgstr "citera platshållare passande för Tcl"
 msgid "show only <n> matched refs"
 msgstr "visa endast <n> träffade refs"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "använd formatfärger"
 
@@ -8544,65 +8736,65 @@ msgstr "visa endast referenser som innehåller incheckningen"
 msgid "print only refs which don't contain the commit"
 msgstr "visa endast referenser som inte innehåller incheckningen"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "ta även hänsyn till paket och alternativa objekt"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn för nåbara objekt"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
@@ -8647,31 +8839,31 @@ msgstr "var mer grundlig (ökar körtiden)"
 msgid "enable auto-gc mode"
 msgstr "aktivera auto-gc-läge"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr "tvinga gc-körning även om en annan gc kanske körs"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Kan inte tolka värdet %s för gc.logexpiry"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Se \"git help gc\" för manuell hushållning.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8679,7 +8871,7 @@ msgstr ""
 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
 "är fallet)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8690,12 +8882,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: misslyckades skapa tråd. %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -8704,245 +8896,245 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "trådstöd saknas, ignorerar %s"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "kunde inte läsa träd (%s)"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kunde inte \"grep\" från objekt av typen %s"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt värde"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "sök i indexet istället för i arbetskatalogen"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "sök i innehåll som inte hanteras av git"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "sök i både spårade och ospårade filer"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "sök varje undermodul rekursivt"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "visa rader som inte träffas"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "skiftlägesokänslig sökning"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "matcha endast mönster vid ordgränser"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "hantera binärfiler som text"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "träffa inte mönster i binärfiler"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "hantera binärfiler med textconv-filter"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "gå som mest ned <djup> nivåer"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "använd utökade POSIX-reguljära uttryck"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mönster som fixerade strängar"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "använd Perlkompatibla reguljära uttryck"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istället för träffade rader"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "synonym för --files-with-matches"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "visa endast namn på filer utan träffar"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "visa antal träffar istället för träffade rader"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "ljusmarkera träffar"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan träffar från olika filer"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang före och efter träffar"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang före träffar"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter träffar"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "använd <n> jobbtrådar"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "genväg för -C NUM"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet före träffen"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "läs mönster från fil"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "träffa <mönster>"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "kombinera mönster som anges med -e"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "ange träff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr "visa endast träffar från filer som träffar alla mönster"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "visa analysträd för grep-uttryck"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "bläddrare"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "visa träffade filer i filbläddraren"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "inget mönster angavs."
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index och --untracked kan inte användas med revisioner"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "kan inte slå upp revision: %s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trådar angivet (%d)"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "trådstöd saknas, ignorerar --threads"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "flaggan stöds inte med --recurse-submodules."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached och --untracked kan inte användas med --no-index."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "både --cached och träd angavs."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8950,37 +9142,37 @@ msgstr ""
 "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
 "<fil>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "typ"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "objekttyp"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "skriv objektet till objektdatabasen"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "läs objektet från standard in"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "spara filen som den är utan filer"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "hantera filen som om den kom från sökvägen"
 
@@ -9112,152 +9304,152 @@ msgstr "\"%s\" är ett alias för \"%s\""
 msgid "usage: %s%s"
 msgstr "användning: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "kunde inte öppna %s"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "objekttyp stämmer inte överens vid %s"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "emottog inte det förväntade objektet %s"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objektet %s: förväntad typ %s, såg %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "kan inte fylla %d byte"
 msgstr[1] "kan inte fylla %d byte"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "tidigt filslut"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "indataläsfel"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "använde fler byte än tillgängligt"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "paket för stort för nuvarande definition av off_t"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "paket är större än tillåten maximal storlek"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "kunde inte skapa \"%s\""
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "kan inte öppna paketfilen \"%s\""
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "paketsignatur stämmer inte överens"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paketversion %<PRIu32> stöds ej"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate returnerade %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "indexvärdespill för deltabasobjekt"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "deltabasindex utanför gränsen"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "okänd objekttyp %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "kan inte utföra \"pread\" på paketfil"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
 msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "allvarlig inflate-inkonsekvens"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "kunde inte läsa %s"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "kan inte läsa information om befintligt objekt %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "kan inte läsa befintligt objekt %s"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ogiltigt blob-objekt %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Fel i objekt"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Inte alla barnobjekt för %s kan nås"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "misslyckades tillämpa delta"
 
@@ -9327,77 +9519,81 @@ msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s är trasigt"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "fel vid stängning av paketfil"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
+msgid "cannot write %s file '%s'"
+msgstr "kan inte ta skriva %s-fil \"%s\""
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
+msgid "cannot close written %s file '%s'"
+msgstr "kan inte stänga skriven %s-fil \"%s\""
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "fel vid stängning av paketfil"
+
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "kan inte spara paketfil"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "kan inte spara indexfil"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "felaktig pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte öppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "icke-delta: %d objekt"
 msgstr[1] "icke-delta: %d objekt"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "kedjelängd = %d: %lu objekt"
 msgstr[1] "kedjelängd = %d: %lu objekt"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "felaktig %s"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin kan inte användas med --stdin"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin kräver ett git-arkiv"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
@@ -9581,120 +9777,120 @@ msgstr "--trailer med --only-input ger ingen mening"
 msgid "no input file given for in-place editing"
 msgstr "ingen indatafil angiven för redigering på plats"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<flaggor>] <objekt>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ogiltig flagga för --decorate: %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "visa källkod"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "Använd e-postmappningsfil"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "dekorera endast referenser som motsvarar <mönster>"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "dekorera inte referenser som motsvarar <mönster>"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "dekoreringsflaggor"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Behandla radintervallet n,m i filen, med början på 1"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kunde inte läsa objektet %s"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Okänd typ: %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "namnet på utdatakatalogen är för långt"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kan inte öppna patchfilen %s"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Behöver precis ett intervall."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "Inte ett intervall."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "Omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "Två utdatakataloger?"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Okänd incheckning %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "Kunde inte hitta exakt sammanslagningsbas."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9705,226 +9901,226 @@ msgstr ""
 "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
 "manuellt."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "Kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "basincheckningen bör vara förfader till revisionslistan"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bör inte vara i revisionslistan"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "kan inte hämta patch-id"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "använd [PATCH n/m] även för en ensam patch"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "börja numrera patchar på <n> istället för 1"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Använd  [RFC PATCH] istället för [PATCH]"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Använd [<prefix>] istället för [PATCH]"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "använd hashvärde med nollor i From-huvud"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istället för standard (patch + stat)"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "gör det första brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "lägg till förhandskrävd trädinfo i patchserien"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "visa förloppsindikator medan patchar skapas"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "-n och -k kan inte användas samtidigt."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "standard ut, eller katalog, vilken skall det vara?"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Kunde inte skapa katalogen \"%s\""
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "Skapar patchar"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "Misslyckades skapa utdatafiler"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10076,7 +10272,7 @@ msgstr "ta hänsyn till url.<bas>.insteadOf"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "visa underliggande referens och objektet det pekar på"
 
@@ -10121,183 +10317,183 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
 msgid "empty mbox: '%s'"
 msgstr "tom mbox: �%s�"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<flaggor>] [<incheckning>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "visa inte en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "visa en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "skapa en ensam incheckning istället för en sammanslagning"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte är möjlig"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pågående sammanslagningen"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "fortsätt den pågående sammanslagningen"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "tillåt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "bekräfta commit-msg-krok"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (inget att platta till)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "\"%s\" verkar inte peka på en incheckning"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Felaktig flagga för merge-recursive: -X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "kunde inte skriva %s"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
 "den.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10313,69 +10509,69 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppström angiven för aktuell gren."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Ingen fjärrspårande gren för %s från %s"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "inte något vi kan slå ihop med %s: %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "inte något vi kan slå ihop"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10383,7 +10579,7 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10391,114 +10587,114 @@ msgstr ""
 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Du kan inte kombinera --squash med --no-ff."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte något vi kan slå ihop"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Incheckning %s har inte någon GPG-signatur."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "vägrar slå samman orelaterad historik"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "Redan à jour."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "Redan à jour. Toppen!"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "Kan inte snabbspola, avbryter."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Återspolar trädet till orört...\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Använder %s för att förbereda lösning för hand.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10654,72 +10850,72 @@ msgstr "%.*s är i indexet"
 msgid "force move/rename even if target exists"
 msgstr "tvinga flytta/ändra namn även om målet finns"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "hoppa över fel vid flytt/namnändring"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destinationen \"%s\" är ingen katalog"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "felaktig källa"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "kan inte flytta katalog till sig själv"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "kan inte flytta katalog över fil"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "källkatalogen är tom"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "inte versionshanterad"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "destinationen finns"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "skriver över \"%s\""
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Kan inte skriva över"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "flera källor för samma mål"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "destinationskatalogen finns inte"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, källa=%s, mål=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn på \"%s\""
@@ -10911,12 +11107,12 @@ msgstr "kunde inte skriva anteckningsobjekt"
 msgid "the note contents have been left in %s"
 msgstr "anteckningens innehåll har lämnats kvar i %s"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "kunde inte öppna eller läsa \"%s\""
@@ -11163,7 +11359,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
@@ -11196,183 +11392,187 @@ msgid ""
 msgstr ""
 "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "fel i deflate (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "ogiltigt värde för --missing"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stöds ej"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "visa inte förloppsindikator"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "visa förloppsindikator"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "visa förloppsindikator under objektskrivningsfasen"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "som --all-progress när förloppsindikatorn visas"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek på varje utdatapaketfil"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorera lånade objekt från alternativa objektlager"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "begränsa paketfönster efter objekt"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr "begränsa paketfönster efter minne förutom objektgräns"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "maximal längd på deltakedja tillåten i slutligt paket"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "återanvänd befintliga delta"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "återanvänd befintliga objekt"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "använd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr "använd trådar vid sökning efter bästa deltaträffar"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "försök inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "läs revisionsargument från standard in"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "begränsa objekt till de som ännu inte packats"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "inkludera objekt som kan nås från någon referens"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "inkludera objekt som refereras från referensloggposter"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "inkludera objekt som refereras från indexet"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "skriv paket på standard ut"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inkludera taggobjekt som refererar objekt som skall packas"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "behåll onåbara objekt"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "packa lösa onåbara objekt"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onåbara objekt nyare än <tid>"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lämpade för grunda hämtningar"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhörande .keep-fil"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "komprimeringsgrad för paket"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "använd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "hantering av saknade objekt"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "packa inte objekt i kontraktspackfiler"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "Räknar objekt"
 
@@ -11400,15 +11600,19 @@ msgstr "Tar bort duplicerade objekt"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "rapportera borttagna objekt"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "låt tid gå ut för objekt äldre än <tid>"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 
@@ -11509,7 +11713,7 @@ msgstr "Se git-pull(1) för detaljer."
 msgid "<remote>"
 msgstr "<fjärr>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<gren>"
@@ -11532,27 +11736,27 @@ msgstr ""
 "Dina inställningar anger sammanslagning med referensen \"%s\"\n"
 "från fjärren, men någon sådan referens togs inte emot."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures för ombasering"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash är endast giltig med --rebase."
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "checka in eller använd \"stash\" på dem."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11563,7 +11767,7 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11580,15 +11784,15 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
 
@@ -11971,39 +12175,43 @@ msgstr "git rebase--helper [<flaggor>]"
 msgid "keep empty commits"
 msgstr "behåll tomma incheckningar"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "tillåt incheckningar med tomt meddelande"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "fortsätt ombasering"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "avbryt ombasering"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "skapa ombaseringsskript"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "förkorta inchecknings-id i todo-listan"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "utöka inchecknings-id i todo-listan"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "kontrollera todo-listan"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "hoppa över onödiga \"pick\"-kommandon"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "ordna om fixup-/squash-rader"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "lägg in exec-kommandon i todo-listan"
 
@@ -12011,7 +12219,7 @@ msgstr "lägg in exec-kommandon i todo-listan"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12041,7 +12249,7 @@ msgstr ""
 "För att undvika detta meddelande och fortfarande behålla det\n"
 "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12062,15 +12270,15 @@ msgstr ""
 "\n"
 "För att undvika detta meddelande kan du sätta det till \"refuse\"."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "tyst"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Du måste ange en katalog."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "\"%s\" är inte en giltig tidsstämpel"
@@ -12593,87 +12801,87 @@ msgstr ""
 "Använd --no-write-bitmap-index eller inaktivera inställningen\n"
 "pack.writebitmaps"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "packa allt i ett enda paket"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "samma som -a, och gör onåbara objekt lösa"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "ta bort överflödiga paket, och kör git-prune-packed"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "sänd --no-reuse-delta till git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "sänd --no-reuse-object till git-pack-objects"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "kör inte git-update-server-info"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "sänd --local till git-pack-objects"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "skriv bitkartindex"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "cirkadatum"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "med -A, lös inte upp objekt äldre än detta"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "med -a, packa om onåbara objekt"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "storlek på fönster använt för deltakomprimering"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "begränsa maximalt deltadjup"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "begränsar maximalt antal trådar"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "maximal storlek på varje paketfil"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "packa om objekt i paket märkta med .keep"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable och -A kan inte användas samtidigt"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "misslyckades ta bort \"%s\""
@@ -12756,11 +12964,11 @@ msgstr "ändra en inchecknings föräldrar"
 msgid "replace the ref if it exists"
 msgstr "ersätt referensen om den finns"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "använd inte snygg visning av innehåll för --edit"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "använd detta format"
 
@@ -12819,100 +13027,104 @@ msgstr "Kunde inte hitta träder för HEAD."
 msgid "Failed to find tree of %s."
 msgstr "Kunde inte hitta träder för %s."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD är nu på %s"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "var tyst, rapportera endast fel"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "återställ HEAD och index"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "återställ endast HEAD"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "återställ HEAD, index och arbetskatalog"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "återställ HEAD men behåll lokala ändringar"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Kan inte göra %s återställning med sökvägar."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s återställning tillåts inte i ett naket arkiv"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N kan endast användas med --mixed"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Oköade ändringar efter återställning:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "objektfiltrering kräver --objects"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "ogiltigt värde för sparse: \"%s\""
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list stöder inte visning av anteckningar"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
 
@@ -13016,10 +13228,6 @@ msgstr "lägg till incheckningsnamn"
 msgid "preserve initially empty commits"
 msgstr "behåll incheckningar som börjar som tomma"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "tillåt incheckningar med tomt meddelande"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "behåll redundanta, tomma incheckningar"
@@ -13363,35 +13571,39 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
 msgid "prepend comment character and space to each line"
 msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "Ingen sådan referens: %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Förväntade fullt referensnamn, fick %s"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote tar inga argument"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "kan inte ta bort en komponent från url:en \"%s\""
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13400,54 +13612,54 @@ msgstr ""
 "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget "
 "officiella uppström."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "Dölj utdata från initiering av undermodul"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<sökväg>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "misslyckades rekursera in i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr "Hindra statusutskrift för undermodul"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -13455,54 +13667,143 @@ msgstr ""
 "Visa incheckning från indexet istället för den som lagrats i undermodulens "
 "HEAD"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "rekursera in i nästlade undermoduler"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sökväg>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synkroniserar undermodul-url för \"%s\"\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Dölj utdata från synkroniering av undermodul-url"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "Rekursera in i nästlade undermoduler"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
+"\" om du verkligen vill ta bort den och all dess historik)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
+"dem"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Rensade katalogen \"%s\"\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "kunde inte skapa tom undermodulskatalog %s"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "Avregistrera alla undermoduler"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "var den nya undermodulen skall klonas till"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "djup för grunda kloner"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "tvinga kloningsförlopp"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13510,82 +13811,82 @@ msgstr ""
 "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
 "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "misslyckades klona \"%s\" till undermodulsökvägen �%s�"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Undermodulsökvägen \"%s\" har inte initierats"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Kanske menade du att använda \"update --init\"?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar över ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar över undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "sökväg inuti arbetskatalogen"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout eller none"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "om den första klonen skall följa rekommendation för grund kloning"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "skriv inte klonförlopp"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "felaktigt värde för parametern update"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13594,20 +13895,20 @@ msgstr ""
 "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
 "huvudprojektet är inte på någon gren"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s stöder inte --super-prefix"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -13713,139 +14014,143 @@ msgstr "kunde inte signera taggen"
 msgid "unable to write tag file"
 msgstr "kunde inte skriva tagg-filen"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "felaktig objekttyp."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "inget taggmeddelande?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Taggmeddelandet har lämnats i %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "lista taggnamn"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "visa <n> rader från varje taggmeddelande"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "ta bort taggar"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "verifiera taggar"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Alternativ för att skapa taggar"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "annoterad tagg, behöver meddelande"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "taggmeddelande"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "tvinga redigering av incheckningsmeddelande"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "annoterad och GPG-signerad tagg"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "använd annan nyckel för att signera taggen"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "ersätt taggen om den finns"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "skapa en reflog"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Alternativ för listning av taggar"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "lista taggar i spalter"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "visa endast taggar som innehåller incheckningen"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "visa endast taggar som inte innehåller incheckningen"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "visa endast taggar som slagits samman"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "visa endast taggar som ej slagits samman"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "visa endast taggar för objektet"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column och -n är inkompatibla"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "Flaggan -n är endast tillåten i listläge"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "Flaggan --contains är endast tillåten i listläge"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Flaggan --no-contains är endast tillåten i listläge"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "Flaggan --points-at är endast tillåten i listläge"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "endast en av flaggorna -F eller -m tillåts."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "för många parametrar"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "Packar upp objekt"
 
@@ -14174,8 +14479,8 @@ msgid "print tag contents"
 msgstr "visa innehåll för tag"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14186,29 +14491,37 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<flaggor>] <sökväg>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<flaggor>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <sökväg>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Tar bort worktrees/%s: inte en giltig katalog"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -14217,104 +14530,181 @@ msgstr ""
 "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
 "%<PRIuMAX>)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "rapportera borttagna arbetskataloger"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Förbereder %s (identifieraren %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "skapa eller återställ en gren"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "befolka den nya arbetskatalogen"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "låt arbetskatalogen förbli låst"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "ställ in spårningsläge (se git-branch(1))"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B och --detach är ömsesidigt uteslutande"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track kan endast användas när ny gran skapas"
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "orsak till lås"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "\"%s\" är inte en arbetskatalog"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" är redan låst, orsak: %s"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" är redan låst"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "\"%s\" är inte en huvudarbetskatalog"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "kunde inte lista ut målnamn från \"%s\""
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "målet \"%s\" finns redan"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "kan inte flytta en låst arbetskatalog, orsak till lås: %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "kan inte flytta en låst arbetskatalog"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "misslyckades flytta \"%s\" till \"%s\""
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "misslyckades köra \"git status\" på \"%s\""
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "\"%s\" är smutsigt, använd --force för att ta bort det"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "misslyckades ta bort \"%s\""
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "tvinga ta bort även om arbetskatalogen är smutsig"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "kan inte ta bort en låst arbetskatalog, orsak till låset: %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "kan inte ta bort en låst arbetskatalog"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -14331,23 +14721,23 @@ msgstr "visa trädobjekt för underkatalogen <prefix>"
 msgid "only useful for debugging"
 msgstr "endast användbart vid felsökning"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<flaggor>] <katalog>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
 
@@ -14368,6 +14758,21 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "skriv felsökningsmeddelanden på standard fel"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
+"           [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
+"           <kommando> [<flaggor>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14378,20 +14783,66 @@ msgstr ""
 "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
 "<koncept>\" för att läsa mer om specifika underkommandon och koncept."
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "ingen katalog angavs för --git-dir\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "ingen namnrymd angavs för --namespace\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "ingen katalog angavs för --work-tree\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "inget prefix angavs för --super-prefix\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c förväntar en konfigurationssträng\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "ingen katalog angavs för -C\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "okänd flagga: %s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "misslyckades köra kommandot \"%s\": %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer har negativt värde; använder förvalet %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14402,16 +14853,16 @@ msgstr ""
 "        bad om: %s\n"
 "  omdirigering: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "omdirigerar till %s"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "argument"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "objektfiltrering"
 
@@ -14519,23 +14970,23 @@ msgstr "Visa status för arbetskatalogen"
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "giltig-till"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "ingen funktion (bakåtkompatibilitet)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "var mer pratsam"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "var mer tyst"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "använd <n> siffror för att visa SHA-1:or"
 
@@ -14772,7 +15223,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -14786,41 +15237,41 @@ msgstr ""
 "För att avbryta och återgå till där du var före ombaseringen, kör \"git "
 "rebase --abort\"."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Kunde inte flytta tillbaka till $head_name"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "Tillämpade autostash."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kan inte spara $stash_sha1"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vägrade ombaseringen."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "Kan inte läsa HEAD"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14828,7 +15279,7 @@ msgstr ""
 "Du måste redigera alla sammanslagningskonflikter och\n"
 "därefter markera dem som lösta med git add"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14849,75 +15300,75 @@ msgstr ""
 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
 "något av värde där."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "ogiltig uppström \"$upstream_name\""
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: mer än en sammanslagningsbas finns"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: ingen sammanslagningsbas finns"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Peka på en giltig incheckning: $onto_name"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "Kan inte utföra \"autostash\""
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Skapade autostash: $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "Checka in eller använd \"stash\" på dem."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD är à jour."
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Aktuell gren $branch_name är à jour."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD är à jour, ombasering framtvingad."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Ändringar från $mb till $onto:"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Snabbspolade $branch_name till $onto_name."
@@ -14985,86 +15436,86 @@ msgstr "Kan inte spara aktuell status"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort ändringar i arbetskatalogen"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "okänd flagga: $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "Inga \"stash�-poster hittades."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "För många revisioner angivna: $REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference är inte en giltig referens"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "\"$args\" är inte en \"stash\"-referens"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "kan inte uppdatera indexet"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikter i indexet. Testa utan --index."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "Kunde inte spara indexträd"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "Kunde inte återställa ospårade filer från stash-post"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "Kan inte ta bort ändrade filer ur kön"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits ur kön."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr "Stash-posten behålls ifall du behöver den igen."
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Kastade ${REV} ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Kunde inte kasta \"stash\"-post"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(För att återställa dem, skriv \"git stash apply\")"
 
@@ -15162,66 +15613,17 @@ msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr ""
 "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "sökvägsangivelse och --all är inkompatibla"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n"
-"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
-"kastar bort dem"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Rensade katalogen \"$displaypath\""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15230,12 +15632,12 @@ msgstr ""
 "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
 "undermodulsökvägen \"$sm_path\""
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15244,83 +15646,78 @@ msgstr ""
 "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
 "Direkt hämtning av incheckningen misslyckades."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Flaggan --cached kan inte användas med flaggan --files"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "oväntat läge $mod_dst"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_src"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_dst"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Varning: $display_name innehåller inte incheckningarna $sha1_src och "
 "$sha1_dst"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Synkroniserar undermodul-url för \"$displaypath\""
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15374,7 +15771,7 @@ msgstr ""
 "\n"
 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15393,83 +15790,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: inte en incheckning som kan väljas"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Felaktigt incheckningsnamn: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Snabbspolade till $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "Kan inte snabbspola till $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Kan inte flytta HEAD till $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Fel när sammanslagningen $sha1 skulle göras om"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Kunde inte välja $sha1"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Det här är incheckningsmeddelande ${n}:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Det här är en kombination av $count incheckning."
 msgstr[1] "Det här är en kombination av $count incheckningar."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Kan inte skriva $fixup_msg"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "Det här är en kombination av 2 incheckningar."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Kunde inte tillämpa $sha1... $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15483,31 +15880,31 @@ msgstr ""
 "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
 "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Stoppade på $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Kör: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Körning misslyckades: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15518,7 +15915,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15533,29 +15930,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Okänt kommando: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Rätta det med \"git rebase --edit-todo\"."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Lyckades ombasera och uppdatera $head_name."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "kunde inte koppla från HEAD"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15586,11 +15983,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15598,11 +15995,11 @@ msgstr ""
 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
 "först och kör sedan \"git rebase --continute\" igen."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "Kunde inte checka in köade ändringar."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15616,44 +16013,44 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "Kunde inte starta textredigerare"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Kunde inte checka ut $switch_to"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "Inget HEAD?"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Kunde inte skapa temporär $state_dir"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "Kunde inte markera som interaktiv"
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "Kunde inte initiera omskrivna incheckningar"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "Kunde inte skapa todo-lista"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
 msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15663,7 +16060,7 @@ msgstr ""
 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Observera att tomma incheckningar är utkommenterade"
 
@@ -15802,7 +16199,7 @@ msgstr "Lägg till ospårad"
 msgid "No untracked files.\n"
 msgstr "Inga ospårade filer.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15810,7 +16207,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "köas omedelbart."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15818,7 +16215,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "läggas till i \"stash\" omedelbart."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15826,7 +16223,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "tas bort från kön omedelbart."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15834,7 +16231,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "markeras för applicering omedelbart."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15842,16 +16239,16 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "markeras för kasta omedelbart."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -15865,7 +16262,7 @@ msgstr ""
 "Rader som börjar med %s kommer att tas bort.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15875,7 +16272,7 @@ msgstr ""
 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
 "redigeringen och stycket lämnas oförändrat.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
@@ -15886,14 +16283,14 @@ msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
 "[y/n]? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15907,7 +16304,7 @@ msgstr ""
 "a - köa stycket och alla följande i filen\n"
 "d - köa inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15921,7 +16318,7 @@ msgstr ""
 "a - \"stash\":a stycket och alla följande i filen\n"
 "d - \"stash\":a inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15935,7 +16332,7 @@ msgstr ""
 "a - ta bort stycket och alla följande i filen från kön\n"
 "d - ta inte bort stycket eller något av de följande i filen från kön"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15949,7 +16346,7 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15963,7 +16360,7 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15977,7 +16374,7 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15991,7 +16388,7 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16013,197 +16410,211 @@ msgstr ""
 "e - redigera aktuellt stycke manuellt\n"
 "? - visa hjälp\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Markerade stycken kan inte appliceras på indexet!\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "Applicera dem på arbetskatalogen trots det? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "Ingenting applicerades.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorerar ej sammanslagen: %s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Endast binära filer ändrade.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "Inga ändringar.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Uppdatera patch"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Köa borttagning [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Köa stycket [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Köa stycket [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "Inga andra stycken att gå till\n"
+
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "gå till vilket stycke (<ret> för att se fler)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "gå till vilket stycke? "
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ogiltigt siffervärde: \"%s\"\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Beklagar, det finns bara %d stycke.\n"
 msgstr[1] "Beklagar, det finns bara %d stycken.\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "Inga andra stycken att söka efter\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "sök efter reguljärt uttryck? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "Inga stycken motsvarar givet mönster\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "Inget föregående stycke\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "Inget följande stycke\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Beklagar, kan inte dela stycket\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Dela i %d stycke.\n"
 msgstr[1] "Dela i %d stycken.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Beklagar, kan inte redigera stycket\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Granska diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16220,85 +16631,93 @@ msgstr ""
 "diff          - visa diff mellan HEAD och index\n"
 "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "saknad --"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "okänt läge för --patch: %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "felaktigt argument %s, förväntar --"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Kan inte köra git format-patch från utanför arkivet\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
+"eller konfigurationsflagga)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Okänd inställning i --confirm: \"%s\"\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "varning: \":include:\" stöds inte: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "varning: sendmail-raden känns inte igen: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16313,12 +16732,12 @@ msgstr ""
 "    * Säga \"./%s\" om du menar en fil; eller\n"
 "    * Ange flaggan --format-patch om du menar ett intervall.\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Misslyckades utföra opendir %s: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16327,7 +16746,7 @@ msgstr ""
 "ödesdigert: %s: %s\n"
 "varning: inga patchar har sänts\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16337,17 +16756,17 @@ msgstr ""
 "Inga patchfiler angavs!\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ingen ärenderad i %s?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Kunde inte öppna för skrivning %s: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16361,42 +16780,38 @@ msgstr ""
 "\n"
 "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Misslyckades öppna %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Misslyckades öppna %s: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Misslyckades öppna %s.final: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "Sammanfattande brev tomt, hoppar över\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16409,21 +16824,21 @@ msgstr ""
 "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
 "vill sända.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Till vem skall breven sändas (om någon)?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID att använda som In-Reply-To för det första brevet (om något)? "
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
@@ -16431,16 +16846,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA-sökvägen \"%s\" finns inte"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16467,124 +16882,124 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Svar krävs på frågan \"Sända brevet?\""
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "Nödvändig SMTP-server har inte angivits korrekt."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servern stöder inte SMARTTLS! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS misslyckades! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
 "smtp-debug."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Misslyckades sända %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Test-Sände %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Sände %s\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "Test-OK. Loggen säger:\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "OK. Loggen säger:\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Resultat: OK\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Kunde inte köra \"%s\""
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) misslyckades stänga röret till \"%s\""
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "kan inte sända brev som sjubitars"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "ogiltig överföringskondning"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: patchen innehåller en rad längre än 998 tecken"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
@@ -16592,11 +17007,30 @@ msgstr ""
 "säkerhetskopior.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "ogiltig filterspec-utryck \"%s\""
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "En kopia av patchen som misslyckades finns i: %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "sökvägsangivelse och --all är inkompatibla"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
+
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
 #~ "please use . instead if you meant to match all paths"
@@ -17025,9 +17459,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Unprocessed path??? %s"
 #~ msgstr "Obehandlad sökväg??? %s"
 
-#~ msgid "Error wrapping up %s"
-#~ msgstr "Fel vid ombrytning av %s"
-
 #~ msgid "Cannot %s during a %s"
 #~ msgstr "kan inte %s under en %s"
 
diff --git a/po/vi.po b/po/vi.po
index 5bf6f15..1ad2005 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.16.0\n"
+"Project-Id-Version: git v2.17.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-07 08:17+0700\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-17 07:50+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -72,7 +72,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
 
@@ -477,7 +477,7 @@ msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện t
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry gặp lỗi đối với đư�ng dẫn “%s�"
@@ -552,7 +552,7 @@ msgstr[0] "�ang áp dụng miếng vá %%s với %d lần từ chối…"
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được “%s�"
@@ -607,11 +607,11 @@ msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắn
 msgid "Unable to write new index file"
 msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "đư�ng-dẫn"
@@ -624,7 +624,7 @@ msgstr "không áp dụng các thay đổi khớp với đư�ng dẫn đã cho
 msgid "apply changes matching the given path"
 msgstr "áp dụng các thay đổi khớp với đư�ng dẫn đã cho"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "số"
 
@@ -666,78 +666,78 @@ msgstr "áp dụng một miếng vá mà không động chạm đến cây làm
 msgid "accept a patch that touches outside the working area"
 msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "đồng th�i áp dụng miếng vá (dùng với tùy ch�n --stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "xây dựng bảng mục lục tạm th�i trên cơ sở thông tin bảng mục lục được nhúng"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "các đư�ng dẫn bị ngăn cách bởi ký tự NULL"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "hành động"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chi�u ngược"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "đừng hy v�ng có ít nhất một dòng nội dung"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "chi tiết"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "gốc"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "treo thêm <root> vào tất cả các tên tập tin"
 
@@ -773,7 +773,7 @@ msgstr "định_dạng"
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "ti�n_tố"
 
@@ -781,11 +781,11 @@ msgstr "ti�n_tố"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "nối thêm ti�n tố vào từng đư�ng dẫn tập tin trong kho lưu"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "tập_tin"
 
@@ -817,8 +817,8 @@ msgstr "nén nh� hơn"
 msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "kho"
 
@@ -869,22 +869,22 @@ msgstr ""
 "Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
 "Dùng “\\!� cho các chuỗi văn bản có dấu chấm than dẫn đầu."
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "nội dung được trích dẫn sai tập tin “%s�: %s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Chúng tôi không bisect thêm nữa!\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Không phải tên đối tượng commit %s hợp lệ"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -893,7 +893,7 @@ msgstr ""
 "Hòa trộn trên %s là sai.\n"
 "�i�u đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -902,7 +902,7 @@ msgstr ""
 "Hòa trộn trên %s là mới.\n"
 "Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -911,7 +911,7 @@ msgstr ""
 "Hòa trộn trên %s là %s.\n"
 "�i�u đó có nghĩa là lần chuyển giao “%s� đầu tiên là giữa %s và [%s].\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -922,7 +922,7 @@ msgstr ""
 "git bisect không thể làm việc đúng đắn trong trư�ng hợp này.\n"
 "Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -939,31 +939,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecting: n�n hòa trộn cần phải được kiểm tra\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "cần một điểm xét duyệt %s"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "không thể tạo tập tin “%s�"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "không thể đ�c tập tin “%s�"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "việc đ�c tham chiếu bisect gặp lỗi"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s là cả %s và %s\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -972,7 +972,7 @@ msgstr ""
 "không tìm thấy lần chuyển giao kiểm tra được nào.\n"
 "Có lẽ bạn bắt đầu với các tham số đư�ng dẫn sai?\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -981,45 +981,45 @@ msgstr[0] "(ước chừng %d bước)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "tùy ch�n--contents và --reverse không được trộn vào nhau."
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
 "tiên"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "không có đư�ng dẫn %s trong “%s�"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "không thể đ�c blob %s cho đư�ng dẫn “%s�"
@@ -1175,74 +1175,73 @@ msgstr "“%sâ€� không giống nhÆ° tập tin v2 bundle (định dạng dump cá
 msgid "unrecognized header: %s%s (%d)"
 msgstr "phần đầu không được thừa nhận: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "không thể mở “%s�"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "Không thể sản sinh đối tượng gói"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "đối tượng gói đã chết"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "rev-list đã chết"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "th.chiếu “%s� bị loại trừ bởi các tùy ch�n rev-list"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "đối số không được thừa nhận: %s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "mục lục gói đã chết"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "giá trị màu không hợp lệ: %.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "không thể phân tích cú pháp %s"
@@ -1252,7 +1251,7 @@ msgstr "không thể phân tích cú pháp %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s không phải là một lần chuyển giao!"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1360,66 +1359,66 @@ msgstr "“%sâ€� dành cho “%sâ€� không phải là dấu vết thá»�i gian há
 msgid "bad zlib compression level %d"
 msgstr "mức nén zlib %d là sai"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mức nén gói %d không hợp lệ"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "không thể phân tích cấu hình dòng lệnh"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "đã có lỗi chưa biết xảy ra trong khi đ�c các tập tin cấu hình"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s không hợp lệ: “%s�"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "không hiểu giá trị core.untrackedCache “%s�; dùng giá trị mặc định “keep�"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "giá trị splitIndex.maxPercentChange “%d� phải nằm giữa 0 và 100"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "không thể phân tích “%s� từ cấu hình dòng lệnh"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "sai biến cấu hình “%s� trong tập tin “%s� tại dòng %d"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s có đa giá trị"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat trên %s gặp lỗi"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "không thể đặt “%s� thành “%s�"
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "không thể thôi đặt “%s�"
@@ -1440,24 +1439,29 @@ msgstr ""
 "Vui lòng chắc chắn là bạn có đủ thẩm quy�n truy cập\n"
 "và kho chứa đã sẵn có."
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "�ang kiểm tra kết nối"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "Không thể chạy “git rev-list�"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "gặp lỗi khi ghi vào rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF nên được thay bằng LF trong %s."
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1465,12 +1469,12 @@ msgstr ""
 "CRLF sẽ bị thay thế bằng LF trong %s.\n"
 "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn."
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF nên được thay bằng LF trong %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF nên thay bằng CRLF trong %s"
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1479,11 +1483,6 @@ msgstr ""
 "LF sẽ bị thay thế bằng CRLF trong %s.\n"
 "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn."
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF nên thay bằng CRLF trong %s"
-
 #: date.c:116
 msgid "in the future"
 msgstr "ở th�i tương lai"
@@ -1589,20 +1588,24 @@ msgstr ""
 "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat�:\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "phần m�m diff ở bên ngoài đã chết, dừng tại %s"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "Các tùy ch�n -G, -S, và --find-object loại từ lẫn nhau"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow cần chính xác một đặc tả đư�ng dẫn"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1611,22 +1614,22 @@ msgstr ""
 "Gặp lỗi khi phân tích đối số tùy ch�n --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Gặp lỗi khi phân tích đối số tùy ch�n --submodule: “%s�"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "nhận thấy đổi tên không chính xác đã bị b� qua bởi có quá nhi�u tập tin."
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "chỉ tìm thấy các bản sao từ đư�ng dẫn đã sửa đổi bởi vì có quá nhi�u tập tin."
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1634,20 +1637,25 @@ msgstr ""
 "bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
 "nữa."
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "không thể mở thư mục “%s�"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này."
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "không thể tạo thư mục cho %s"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "không thể di cư thư mục git từ “%s� sang “%s�"
@@ -1666,184 +1674,192 @@ msgstr "Nội dung l�c"
 msgid "could not stat file '%s'"
 msgstr "không thể lấy thống kê tập tin “%s�"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Máy chủ không có địa chỉ URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: cần danh sách shallow"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "lỗi máy chủ: %s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s�"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc cần multi_ack_detailed"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "dòng shallow không hợp lệ: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "dòng unshallow không hợp lệ: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "Không tìm thấy đối tượng: %s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "lỗi trong đối tượng: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "không tìm shallow nào: %s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "nhận %s %d - %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "lần chuyển giao %s không hợp lệ"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "chịu thua"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "xong"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "nhận %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "�ánh dấu %s là đã hoàn thành"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "đã sẵn có %s (%s)"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "lỗi giao thức: phần đầu gói bị sai"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: không thể rẽ nhánh %s"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s gặp lỗi"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "có lỗi trong sideband demultiplexer"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "Máy chủ không hỗ trợ máy khách shallow"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "Máy chủ hỗ trợ multi_ack_detailed"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "Máy chủ hỗ trợ no-done"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "Máy chủ hỗ trợ multi_ack"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "Máy chủ hỗ trợ side-band-64k"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "Máy chủ hỗ trợ side-band"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "Máy chủ hỗ trợ ofs-delta"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "Máy chủ hỗ trợ bộ l�c"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Phiên bản máy chủ là %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "Máy chủ không hỗ trợ --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "Máy chủ không hỗ trợ --shallow-exclude"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "Máy chủ không hỗ trợ --deepen"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "không có lần chuyển giao chung nào"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch gặp lỗi."
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "không khớp phần đầu máy chủ"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "Không có máy chủ tham chiếu nào như %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
@@ -1867,17 +1883,18 @@ msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s�"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "b� qua màu không hợp lệ “%.*s� trong log.graphColors"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "“%s�: không thể đ�c %s"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "gặp lỗi khi lấy thống kê v� “%s�"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "“%s�: đ�c ngắn"
@@ -2013,19 +2030,18 @@ msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
 msgid "name consists only of disallowed characters: %s"
 msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ngày tháng không hợp lệ: %s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "không thể tổ hợp các kiểu l�c nhi�u đối tượng"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "không thể tổ hợp nhi�u đặc tả kiểu l�c"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "biểu thức đặc tả bộ l�c “%s� không hợp lệ"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor"
 
 #: lockfile.c:151
 #, c-format
@@ -2055,8 +2071,8 @@ msgstr "Không thể tạo “%s.lock�: %s"
 msgid "failed to read the cache"
 msgstr "gặp lỗi khi đ�c bộ nhớ đệm"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục mới"
 
@@ -2073,60 +2089,60 @@ msgstr "addinfo_cache gặp lỗi đối với đư�ng dẫn “%s�"
 msgid "error building trees"
 msgstr "gặp lỗi khi xây dựng cây"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "gặp lỗi khi tạo đư�ng dẫn “%s�%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Gỡ b� %s để tạo chỗ (room) cho thư mục con\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr ": có lẽ là một xung đột D/F?"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "từ chối đóng tập tin không được theo dõi tại “%s�"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "không thể đ�c đối tượng %s “%s�"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "đối tượng blob được mong đợi cho %s “%s�"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "gặp lỗi khi mở “%s�: %s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "gặp lỗi khi tạo liên kết m�m (symlink) “%s�: %s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "không hiểu phải làm gì với %06o %s “%s�"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Không thể thêm %s vào cơ sở dữ liệu"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2135,7 +2151,7 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
 "còn lại trong cây (tree)."
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2144,7 +2160,7 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
 "của %s còn lại trong cây (tree)."
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2153,7 +2169,7 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
 "còn lại trong cây (tree) tại %s."
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2162,20 +2178,20 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
 "của %s còn lại trong cây (tree) tại %s."
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "đổi tên"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "đã đổi tên"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2184,141 +2200,141 @@ msgstr ""
 "XUNG �ỘT (đổi-tên/đổi-tên): �ổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
 "tên \"%s\"->\"%s\" trong \"%s\"%s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr " (cần giải quyết)"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "XUNG �ỘT (đổi-tên/đổi-tên): �ổi tên %s->%s trong %s. �ổi tên %s->%s trong %s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "�ang đổi tên %s thành %s thay vì %s thành %s"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "XUNG �ỘT (đổi-tên/thêm): �ổi tên %s->%s trong %s. %s được thêm vào trong %s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "Thêm hòa trộn %s"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Thay vào đó thêm vào %s"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "không thể đ�c đối tượng %s"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "đối tượng %s không phải là một blob"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "sửa đổi"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "đã sửa"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "ná»™i dung"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "thêm/thêm"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "�ã b� qua %s (đã có sẵn lần hòa trộn này)"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Tự-động-hòa-trộn %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "mô-đun-con"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "XUNG �ỘT (%s): Xung đột hòa trộn trong %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "�ang xóa %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "tập-tin/thư-mục"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "thư-mục/tập-tin"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "XUNG �ỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
 "%s"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "Thêm \"%s\""
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "Bảng mục lục bẩn: không thể hòa trộn (bẩn: %s)"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "�ã cập nhật rồi!"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "hòa trộn các cây %s và %s gặp lỗi"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "�ang trộn:"
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "tìm thấy %u tổ tiên chung:"
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "hòa trộn không trả v� lần chuyển giao nào"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Không thể phân tích đối tượng “%s�"
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "Không thể ghi bảng mục lục"
 
@@ -2339,18 +2355,18 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)."
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "Không thể chuyển giao cây ghi chú chưa được khởi tạo hoặc không được tham "
 "chiếu"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Giá trị notes.rewriteMode sai: “%s�"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)"
@@ -2359,7 +2375,7 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Giá trị %s sai: “%s�"
@@ -2369,26 +2385,26 @@ msgstr "Giá trị %s sai: “%s�"
 msgid "unable to parse object: %s"
 msgstr "không thể phân tích đối tượng: “%s�"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx h�ng à?)"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị h�ng à?)"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "cách dùng: %s"
@@ -2396,17 +2412,17 @@ msgstr "cách dùng: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "     hoặc: %s"
 
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-S�"
 
@@ -2499,7 +2515,7 @@ msgstr "đặc tả đư�ng dẫn “%s� vượt ra ngoài liên kết m�m
 msgid "unable to parse --pretty format"
 msgstr "không thể phân tích định dạng --pretty"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2508,7 +2524,7 @@ msgstr ""
 "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
 "Dùng phiên bản %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2517,22 +2533,22 @@ msgstr ""
 "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
 "Dùng phiên bản %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "không thể đóng “%s�"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "không thể lấy thông tin thống kê v� “%s�"
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "không thể mở thư mục git: %s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "không thể b� liên kết (unlink): “%s�"
@@ -2551,18 +2567,18 @@ msgstr "cập nhật tham chiếu bị cấm trong môi trư�ng kiểm tra"
 msgid "could not remove reference %s"
 msgstr "không thể gỡ b� tham chiếu: %s"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "không thể xóa b� tham chiếu %s: %s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "không thể xóa b� tham chiếu: %s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "đã ra đi"
 
@@ -2756,129 +2772,139 @@ msgstr "(HEAD được tách r�i từ %s)"
 msgid "(no branch)"
 msgstr "(không nhánh)"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "thiếu đối tượng %s cho %s"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "đối tượng dị hình tại “%s�"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "đang l� đi tham chiếu với tên h�ng %s"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "đang l� đi tham chiếu h�ng %s"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "định dạng: thiếu nguyên tử %%(end)"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "tên đối tượng dị hình %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Không thể lấy v� cả %s và %s cho %s"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s thư�ng theo dõi %s, không phải %s"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s theo dõi cả %s và %s"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD không chỉ đến một nhánh nào cả"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "không có nhánh nào như thế: “%s�"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "không có thượng nguồn được cấu hình cho nhánh “%s�"
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 "nhánh thượng nguồn “%s� không được lưu lại như là một nhánh theo dõi máy chủ"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "đẩy lên đích “%s� trên máy chủ “%s� không có nhánh theo dõi nội bộ"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "nhánh “%s� không có máy chủ để đẩy lên"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "đẩy refspecs cho “%s� không bao gồm “%s�"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "đẩy lên mà không có đích (push.default là “nothing�)"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "không thể phân giải đẩy “đơn giản� đến một đích đơn"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Nhánh của bạn dựa trên cơ sở là “%s�, nhưng trên thượng nguồn không còn.\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Nhánh của bạn đã cập nhật với “%s�.\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Nhánh của bạn và “%s� tham chiếu đến các lần chuyển giao khác nhau.\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (dùng \"%s\" để biết thêm chi tiết)\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Nhánh của bạn đứng trước “%s� %d lần chuyển giao.\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2887,11 +2913,11 @@ msgstr[0] ""
 "Nhánh của bạn đứng đằng sau “%s� %d lần chuyển giao, và có thể được chuyển-"
 "tiếp-nhanh.\n"
 
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2904,30 +2930,30 @@ msgstr[0] ""
 "và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
 "tương ứng với mỗi lần.\n"
 
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
 "bạn)\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "nhánh hiện tại của bạn có vẻ như bị h�ng"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "nhánh hiện tại của bạn “%s� không có một lần chuyển giao nào cả"
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent xung khắc với --bisect"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "gặp lỗi khi mở “/dev/null�"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -2937,24 +2963,29 @@ msgstr ""
 "Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"gặp gói flush không cần trong khi đ�c tình trạng giải nén gói trên máy chủ"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "máy chủ gặp lỗi unpack: %s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "gặp lỗi khi ký chứng thực đẩy"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -2962,32 +2993,37 @@ msgstr ""
 "đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
 "signed"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "kết thúc nhận không hỗ trợ các tùy ch�n của lệnh push"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "chế độ d�n dẹp ghi chú các lần chuyển giao không hợp lệ “%s�"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "hoàn nguyên"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Không nhận ra thao tác: %d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2995,7 +3031,7 @@ msgstr ""
 "sau khi giải quyết các xung đột, đánh dấu đư�ng dẫn đã sửa\n"
 "với lệnh “git add <đư�ng_dẫn>� hoặc “git rm <đư�ng_dẫn>�"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3005,43 +3041,43 @@ msgstr ""
 "với lệnh “git add <đư�ng_dẫn>� hoặc “git rm <đư�ng_dẫn>�\n"
 "và chuyển giao kết quả bằng lệnh “git commit�"
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "không thể khóa “%s�"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "không thể ghi vào “%s�"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "không thể ghi eol vào “%s�"
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "gặp lỗi khi finalize “%s�"
+msgid "failed to finalize '%s'"
+msgstr "gặp lỗi khi hoàn thành “%s�"
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "Không thể đ�c “%s�."
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: chuyển-tiếp-nhanh"
@@ -3049,20 +3085,20 @@ msgstr "%s: chuyển-tiếp-nhanh"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "không thể phân giải lần chuyển giao HEAD"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "không thể cập nhật cây bộ nhớ đệm"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3091,17 +3127,132 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "móc “prepare-commit-msg� bị lỗi"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
+"sở\n"
+"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
+"xác không.\n"
+"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
+"trên\n"
+"một cách rõ ràng. Chạy lệnh sau đây là theo các hướng dẫn trong bộ soạn "
+"thảo\n"
+"để chỉnh sửa tập tin cấu hình của mình:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho\n"
+"lần chuyển giao này với lệnh:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
+"sở\n"
+"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
+"xác không.\n"
+"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
+"trên một cách rõ ràng:\n"
+"\n"
+"    git config --global user.name \"Tên của bạn\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần "
+"chuyển giao này với lệnh:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr ""
+"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "đã r�i kh�i HEAD"
+
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr " (root-commit)"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "không thể phân tích HEAD"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s không phải là một lần chuyển giao!"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "không thể phân tích tác giả của lần chuyển giao"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "không thể đ�c phần chú thích (message) từ “%s�"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "không thể phân tích lần chuyển giao %s"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "không thể phân tích lần chuyển giao cha mẹ “%s�"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3112,7 +3263,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3123,244 +3274,248 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "�ây là tổ hợp của %d lần chuyển giao."
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "cần một HEAD để sửa"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "không thể đ�c phần chú thích (message) của HEAD"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "không thể ghi “%s�"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "�ây là chú thích cho lần chuyển giao thứ nhất:"
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "không thể đ�c phần chú thích (message) của %s"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "�ây là chú thích cho lần chuyển giao thứ #%d:"
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị b� qua:"
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy ch�n -m."
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "lần chuyển giao %s không có cha mẹ %d"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 "luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
 "hòa trộn."
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "không thể đổi tên “%s� thành “%s�"
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "không thể hoàn nguyên %s… %s"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "không thể áp dụng miếng vá %s… %s"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: gặp lỗi đ�c bảng mục lục"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s không nhận các đối số: “%s�"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "thiếu đối số cho %s"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "dòng không hợp lệ %d: %.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "không thể “%s� thể mà không có lần chuyển giao kế trước"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "không thể đ�c “%s�."
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo�."
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "bảng chỉ thị không thể dùng được: %s"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "không có lần chuyển giao nào được phân tích."
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "không thể cherry-pick trong khi hoàn nguyên."
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "khóa không đúng: %s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "giá trị cho %s không hợp lệ: %s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "bảng tùy ch�n dị hình: “%s�"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "có một thao tác “cherry-pick� hoặc “revert� đang được thực hiện"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "không thể tạo thư mục xếp dãy “%s�"
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "không thể khóa HEAD"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "không thể hủy b� từ một nhánh mà nó còn chưa được tạo ra"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "không mở được “%s�"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "không thể đ�c “%s�: %s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "gặp kết thúc tập tin đột xuất"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "tập tin HEAD “pre-cherry-pick� đã lưu “%s� bị h�ng"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
 "bạn!"
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "không thể cập nhật %s"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "không thể đ�c bảng mục lục"
 
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3375,11 +3530,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3396,17 +3551,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�ã áp dụng autostash.\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "không thử lưu “%s�"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3418,57 +3573,52 @@ msgstr ""
 "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
 "nào.\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Dừng lại ở %s…  %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "không thể đ�c orig-head"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "không thể đ�c “onto�."
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "không thể cập nhật %s"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "không thể cập nhật HEAD thành %s"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "không thể xóa b� CHERRY_PICK_HEAD"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "không thể tu b� một lần chuyển giao không tồn tại"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "tập tin không hợp lệ: “%s�"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nội dung không hợp lệ: “%s�"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3478,45 +3628,45 @@ msgstr ""
 "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
 "chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue� lần nữa."
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: không thể cherry-pick một %s"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: điểm xét duyệt sai"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script: các tùy ch�n được không xử lý"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "danh sách cần làm không dùng được: “%s�"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "không nhận ra cài đặt %s cho tùy ch�n rebase.missingCommitsCheck. Nên b� qua."
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3525,7 +3675,7 @@ msgstr ""
 "Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình c�.\n"
 "Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3543,7 +3693,7 @@ msgstr ""
 "Cánh ứng xử có thể là: ignore, warn, error.\n"
 "\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3554,21 +3704,26 @@ msgstr ""
 "continue�.\n"
 "Hoặc là bạn có thể bãi b� việc cải tổ bằng “git rebase --abort�.\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "không thể mở “%s� để ghi"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "không thể phân tích lần chuyển giao “%s�"
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "văn lệnh đã sẵn được sắp đặt rồi."
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "“%s� ở ngoài một kho chứa"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3591,6 +3746,11 @@ msgstr ""
 "Dùng “--� để ngăn cách các đư�ng dẫn kh�i điểm xem xét, như thế này:\n"
 "“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]�"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "tùy ch�n “%s� phải trước các đối số đầu tiên không có tùy ch�n"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3602,73 +3762,143 @@ msgstr ""
 "Dùng “--� để ngăn cách các đư�ng dẫn kh�i điểm xem xét, như thế này:\n"
 "“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]�"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "Không thể đặt thư mục làm việc hiện hành sử dụng cấu hình không hợp lệ"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "thao tác này phải được thực hiện trong thư mục làm việc"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "tìm thấy phần mở rộng kho chưa biết:"
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
+msgid "error opening '%s'"
+msgstr "gặp lỗi khi mở “%s�"
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
-msgstr "Không thể quay lại cwd"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "tập tin .git là quá lớn: “%s�"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "gặp lỗi khi đ�c %s"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "định dạng tập tin git không hợp lệ: %s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "không có đư�ng dẫn trong tập tin git: %s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "Không phải là kho git: %s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "“$%s� quá lớn"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "không phải là kho git: “%s�"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "không thể chdir (chuyển đổi thư mục) sang “%s�"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
+msgstr "không thể quay lại cwd"
+
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "gặp lỗi khi lấy thống kê v� “%*s%s%s�"
 
-#: setup.c:1052
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "Không thể đ�c thư mục làm việc hiện hành"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "Không thể chuyển sang “%s�"
+msgid "cannot change to '%s'"
+msgstr "không thể chuyển sang “%s�"
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"Không phải là kho git (hay bất kỳ cha mẹ nào đến điểm gắn kết %s)\n"
+"không phải là kho git (hay bất kỳ cha mẹ nào đến tận điểm gắn kết %s)\n"
 "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
 "đặt)."
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Gặp vấn đ� với gía trị chế độ tập tin core.sharedRepository (0%.3o).\n"
+"gặp vấn đ� với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n"
 "ngư�i sở hữu tập tin phải luôn có quy�n đ�c và ghi."
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "gặp lỗi khi mở “/dev/null� hay dup"
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "gặp lỗi khi rẽ nhánh tiến trình"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "setsid gặp lỗi"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "đư�ng dẫn “%s� không tồn tại"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "kho tham chiếu “%s� như là lấy ra liên kết vẫn chưa được hỗ trợ."
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "kho tham chiếu “%s� không phải là một kho nội bộ."
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "kho tham chiếu “%s� là nông"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "kho tham chiếu “%s� bị cấy ghép"
@@ -3747,7 +3977,7 @@ msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 "mục tin mô-đun-con “%s� (%s) là một %s, không phải là một lần chuyển giao"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
 
@@ -3771,7 +4001,7 @@ msgstr "không thể chạy “git status� trong mô-đun-con “%s�"
 msgid "submodule '%s' has dirty index"
 msgstr "mô-đun-con “%s� có mục lục còn bẩn"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3779,18 +4009,18 @@ msgstr ""
 "relocate_gitdir cho mô-đun-con “%s� với nhi�u hơn một cây làm việc là chưa "
 "được hỗ trợ"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "không thể tìm kiếm tên cho mô-đun-con “%s�"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "không thể tạo thư mục “%s�"
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3801,20 +4031,20 @@ msgstr ""
 "“%s� sang\n"
 "“%s�\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "không thể đệ quy vào trong mô-đun-con “%s�"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "không thể lấy thông tin thống kê v� ls-files trong .."
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "LỖI: trả v� chuỗi đư�ng dẫn không khớp cwd?"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree trả v� mã không như mong đợi %d"
@@ -3892,7 +4122,7 @@ msgstr "Không thể đặt thượng nguồn của “%sâ€� thành “%sâ€� cá»
 msgid "transport: invalid depth option '%s'"
 msgstr "vận chuyển: tùy ch�n độ sâu “%s� không hợp lệ"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3901,7 +4131,7 @@ msgstr ""
 "Các đư�ng dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
 "có thể được tìm thấy trên m�i máy phục vụ:\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3928,11 +4158,11 @@ msgstr ""
 "để đẩy chúng lên máy phục vụ.\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "Bãi b�."
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Không thể đ�c tham chiếu %s"
@@ -3953,7 +4183,7 @@ msgstr "tên tập tin trống rỗng trong mục tin cây"
 msgid "too-short tree file"
 msgstr "tập tin cây quá ngắn"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3964,7 +4194,7 @@ msgstr ""
 "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
 "chuyển nhánh."
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3974,7 +4204,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3985,7 +4215,7 @@ msgstr ""
 "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
 "trá»™n."
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3995,7 +4225,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4005,7 +4235,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4015,7 +4245,7 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4025,7 +4255,7 @@ msgstr ""
 "trong nó:\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4035,7 +4265,7 @@ msgstr ""
 "checkout:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn chuyển nhánh."
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4045,7 +4275,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4055,7 +4285,7 @@ msgstr ""
 "trá»™n:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn hòa trộn."
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4065,7 +4295,7 @@ msgstr ""
 "trá»™n:\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4074,7 +4304,7 @@ msgstr ""
 "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi %s:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn %s."
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4083,7 +4313,7 @@ msgstr ""
 "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ b� bởi %s:\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4094,7 +4324,7 @@ msgstr ""
 "checkout:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn chuyển nhánh."
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4105,7 +4335,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4115,7 +4345,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn hòa trộn."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4125,7 +4355,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4135,7 +4365,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn %s."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4145,12 +4375,12 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Mục “%s� đè lên “%s�. Không thể buộc."
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4159,7 +4389,7 @@ msgstr ""
 "Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4170,7 +4400,7 @@ msgstr ""
 "nhật checkout rải rác:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4181,7 +4411,7 @@ msgstr ""
 "nhật checkout rải rác:\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4190,12 +4420,12 @@ msgstr ""
 "Không thể cập nhật mô-đun-con:\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "Bãi b�\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "�ang lấy ra các tập tin"
 
@@ -4228,18 +4458,44 @@ msgstr "tên cổng không hợp lệ"
 msgid "invalid '..' path segment"
 msgstr "đoạn đư�ng dẫn “..� không hợp lệ"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "gặp lỗi khi đ�c “%s�"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "“%s� tại cây làm việc chình không phải là thư mục kho"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"tập tin “%s� không chứa đư�ng dẫn tuyệt đối đến vị trí cây làm việc hiện"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "\"%s\" không tồn tại"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "“%s� không phải là tập tin .git, mã lỗi %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "“%s� không chỉ ngược đến “%s�"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "không thể mở “%s� để đ�c và ghi"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "không thể mở “%s� để đ�c"
@@ -4253,156 +4509,156 @@ msgstr "không thể truy cập “%s�"
 msgid "unable to get current working directory"
 msgstr "Không thể lấy thư mục làm việc hiện hành"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "Những đư�ng dẫn chưa được hòa trộn:"
 
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (dùng \"git reset %s <tập-tin>…\" để b� ra kh�i bệ phóng)"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (dùng \"git rm --cached <tập-tin>…\" để b� ra kh�i bệ phóng)"
 
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
 
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
 "cần được giải quyết)"
 
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "Những thay đổi sẽ được chuyển giao:"
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
 
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
 
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (dùng \"git checkout -- <tập-tin>…\" để loại b� các thay đổi trong thư mục "
 "làm việc)"
 
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (chuyển giao hoặc là loại b� các nội dung chưa được theo dõi hay đã sửa "
 "chữa trong mô-đun-con)"
 
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "bị xóa bởi cả hai:"
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "được thêm vào bởi chúng ta:"
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "bị xóa đi bởi h�:"
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "được thêm vào bởi h�:"
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "bị xóa bởi chúng ta:"
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "được thêm vào bởi cả hai:"
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "bị sửa bởi cả hai:"
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "tập tin mới:"
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "đã chép:"
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "đã xóa:"
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "đã sửa:"
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "đã đổi tên:"
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "đổi-kiểu:"
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "không hiểu:"
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "chưa hòa trộn:"
 
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "lần chuyển giao mới, "
 
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "nội dung bị sửa đổi, "
 
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "nội dung chưa được theo dõi, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4410,109 +4666,109 @@ msgstr ""
 "Không sửa hay xóa b� đư�ng ở trên.\n"
 "M�i thứ phía dưới sẽ được xóa b�."
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "Bạn có những đư�ng dẫn chưa được hòa trộn."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (dùng \"git merge --abort\" để bãi b� việc hòa trộn)"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
 
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (dùng \"git commit\" để hoàn tất việc hòa trộn)"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "Bạn đang ở giữa của một phiên “am�."
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "Miếng vá hiện tại bị trống rỗng."
 
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
 
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (dùng \"git am --skip\" để b� qua miếng vá này)"
 
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "thiếu git-rebase-todo"
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "Không thực hiện lệnh nào."
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (xem thêm trong %s)"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "Không có lệnh nào còn lại."
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
 
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Bạn hiện nay đang thực hiện việc “rebase� nhánh “%s� trên “%s�."
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "Bạn hiện nay đang thực hiện việc “rebase� (“cải tổ�)."
 
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 "  (sửa các xung đột và sau đó chạy lệnh “cải tổ� \"git rebase --continue\")"
 
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (dùng lệnh “cải tổ� \"git rebase --skip\" để b� qua lần vá này)"
 
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (dùng lệnh “cải tổ� \"git rebase --abort\" để check-out nhánh nguyên thủy)"
 
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 "  (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ� \"git rebase --"
 "continue\")"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4520,134 +4776,134 @@ msgstr ""
 "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
 "đang “rebase� nhánh “%s� trên “%s�."
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
 "rebase."
 
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Một khi thư mục làm việc của bạn đã g�n gàng, chạy lệnh “cải tổ� \"git "
 "rebase --continue\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
 "rebase nhánh “%s� trên “%s�."
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
 
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (dùng \"git commit --amend\" để “tu bổ� lần chuyển giao hiện tại)"
 
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (chạy lệnh “cải tổ� \"git rebase --continue\" một khi bạn cảm thấy hài "
 "lòng v� những thay đổi của mình)"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
 
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 "  (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
 
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
 "continue\")"
 
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (dùng \"git cherry-pick --abort\" để hủy b� thao tác cherry-pick)"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s�."
 
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
 
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
 
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (dùng \"git revert --abort\" để hủy b� thao tác hoàn nguyên)"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
 "nhánh “%s�."
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
 
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "Trên nhánh "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "rebase đang được thực hiện: lên trên "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "HEAD được tách r�i tại "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "HEAD được tách r�i từ "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "Hiện tại chẳng ở nhánh nào cả."
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "Lần chuyển giao khởi tạo"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "Vẫn chưa chuyển giao"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "Những tập tin chưa được theo dõi"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "Những tập tin bị l� đi"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4659,32 +4915,32 @@ msgstr ""
 "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
 "tự thêm các tập tin mới (xem “git help status�.."
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
 
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr " (dùng tùy ch�n -u để hiển thị các tập tin chưa được theo dõi)"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "Không có thay đổi nào"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4693,70 +4949,74 @@ msgstr ""
 "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
 "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
 "theo dõi hiện diện\n"
 
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
 "đưa vào theo dõi)\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "không có gì để chuyển giao\n"
 
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
 
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "Vẫn không thực hiện lệnh chuyển giao nào"
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD (không nhánh)"
 
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1844
+msgid "different"
+msgstr "khác"
+
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "đằng sau "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "phía trước "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 "thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "gặp lỗi khi b� liên kết (unlink) “%s�"
@@ -4770,7 +5030,7 @@ msgstr "git add [<các-tùy-ch�n>] [--]  <pathspec>…"
 msgid "unexpected diff status %c"
 msgstr "trạng thái lệnh diff không như mong đợi %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "Cập nhật tập tin gặp lỗi"
 
@@ -4821,7 +5081,7 @@ msgstr ""
 "Các đư�ng dẫn theo sau đây sẽ bị l� đi bởi một trong các tập tin .gitignore "
 "của bạn:\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4831,7 +5091,7 @@ msgstr "chạy thử"
 msgid "interactive picking"
 msgstr "sửa bằng cách tương tác"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "ch�n “hunks� theo kiểu tương tác"
 
@@ -4959,10 +5219,10 @@ msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Có lẽ ý bạn là “git add .� phải không?\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "tập tin ghi bảng mục lục bị h�ng"
 
@@ -5014,59 +5274,59 @@ msgstr "độ lệch múi gi� không hợp lệ"
 msgid "Patch format detection failed."
 msgstr "Dò tìm định dạng miếng vá gặp lỗi."
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "Gặp lỗi khi chia nh� các miếng vá."
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "không thể ghi tập tin lưu mục lục"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Nếu bạn muốn b� qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "�ể phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "Miếng vá trống rỗng."
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "dòng thụt l� không hợp lệ: %.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "không thể phân tích lần chuyển giao “%s�"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "Kho thiếu đối tượng blob cần thiết để trở v� trên “3-way merge�."
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5074,38 +5334,29 @@ msgstr ""
 "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
 "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "�ang trở lại để vá cơ sở và “hòa trộn 3-đư�ng�…"
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "Gặp lỗi khi trộn vào các thay đổi."
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "áp dụng vào một lịch sử trống rỗng"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "không thể phục hồi: %s không tồn tại."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -5113,37 +5364,36 @@ msgstr "Thân của lần chuyển giao là:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "�p dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
 "cả [a]: "
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�p dụng: %.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gặp lỗi khi vá tại %s %.*s"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr "Dùng “git am --show-current-patch� để xem miếng vá bị lỗi"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5154,7 +5404,7 @@ msgstr ""
 "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn b� qua miếng "
 "vá này."
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5167,17 +5417,17 @@ msgstr ""
 "Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi h�"
 "\" cho nó."
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "không thể phân tích đối tượng “%s�."
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "gặp lỗi khi d�n bảng mục lục"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5185,134 +5435,142 @@ msgstr ""
 "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am� thất bại cuối cùng.\n"
 "Không thể chuyển tới ORIG_HEAD"
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Giá trị không hợp lệ cho --patch-format: %s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<các-tùy-ch�n>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<các-tùy-ch�n>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "tùy ch�n lịch sử -- không-toán-tử"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "cho phép quay trở lại để hòa trộn kiểu “3way� nếu cần"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "im lặng"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển c� -k cho git-mailinfo"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển c� -b cho git-mailinfo"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển c� -m cho git-mailinfo"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "chuyển c� --keep-cr cho git-mailsplit với định dạng mbox"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "đừng chuyển c� --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "cắt m�i thứ trước dòng scissors"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "chuyển nó qua git-apply"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "định dạng"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "đè lên các l�i nhắn lỗi khi xảy ra lỗi vá nghiêm tr�ng"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "b� qua miếng vá hiện hành"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr "phục hồi lại nhánh gốc và loại b� thao tác vá."
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "b� qua thao tác vá nhưng vẫn giữ HEAD chỉ đến nó."
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "hiển thị miếng vá đã được áp dụng rồi."
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "nói dối v� ngày chuyển giao"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "dùng dấu th�i gian hiện tại cho ngày tác giả"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "mã-số-khóa"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "lần chuyển giao ký-GPG"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "(dùng nội bộ cho git-rebase)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5320,16 +5578,16 @@ msgstr ""
 "Tùy ch�n -b/--binary đã không dùng từ lâu rồi, và\n"
 "nó sẽ được b� đi. Xin đừng sử dụng nó thêm nữa."
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5338,7 +5596,7 @@ msgstr ""
 "Tìm thấy thư mục lạc %s.\n"
 "Dùng \"git am --abort\" để loại b� nó đi."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
 
@@ -5360,8 +5618,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive: Máy chủ không có địa chỉ URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: cần ACK/NAK, nhưng lại nhận được EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: cần ACK/NAK, nhưng lại nhận được gói flush"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5448,109 +5706,109 @@ msgstr "git blame [<các-tùy-ch�n>] [<rev-opts>] [<rev>] [--] <tập-tin>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Hiển thị các mục “blame� như là chúng ta thấy chúng, tăng dần"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "Hiển thị thống kê công sức làm việc"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "Ép buộc báo cáo tiến triển công việc"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "Hiển thị kết xuất điểm số có các mục tin “blame�"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "Hiển thị số dòng gốc (Mặc định: off)"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "Hiển thị định dạng “porcelain� với thông tin chuyển giao mỗi dòng"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "Hiển thị dấu vết th�i gian dạng thô (Mặc định: off)"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Không hiển thị tên tác giả và dấu vết th�i gian (Mặc định: off)"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "B� qua các khác biệt do khoảng trắng gây ra"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Dùng một ph�ng đoán thử nghiệm để tăng cư�ng các diff"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì g�i “git-rev-list�"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "điểm số"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -5563,17 +5821,17 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "4 năm, 11 tháng trước"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "tập tin %s chỉ có %lu dòng"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "Các dòng blame"
 
@@ -5861,17 +6119,17 @@ msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
 msgid "list branches in columns"
 msgstr "liệt kê các nhánh trong các cột"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "khóa"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "tên trư�ng cần sắp xếp"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "đối tượng"
 
@@ -5879,16 +6137,16 @@ msgstr "đối tượng"
 msgid "print only branches of the object"
 msgstr "chỉ hiển thị các nhánh của đối tượng"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "sắp xếp và l�c là phân biệt HOA thư�ng"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "định dạng sẽ dùng cho đầu ra"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "không tìm thấy HEAD ở dưới refs/heads!"
 
@@ -5988,7 +6246,7 @@ msgstr "Cần một kho chứa để có thể tạo một bundle."
 msgid "Need a repository to unbundle."
 msgstr "Cần một kho chứa để có thể giải nén một bundle."
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5996,7 +6254,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <kiểu> | --textconv) | --filters) [--path=<đư�ng/dẫn>] <đối_tượng>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6004,64 +6262,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "hiển thị kiểu đối tượng"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "hiển thị kích thước đối tượng"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "thoát với 0 khi không có lỗi"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "in nội dung đối tượng dạng dễ đ�c"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "dùng một đư�ng dẫn rõ ràng cho --textconv/--filters"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "cho phép -s và -t để làm việc với các đối tượng sai/h�ng"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "đệm kết xuất --batch"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "hiển thị các thông tin v� đối tượng fed  từ đầu vào tiêu chuẩn"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "theo liên kết m�m trong-cây (được dùng với --batch hay --batch-check)"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "hiển thị m�i đối tượng với --batch hay --batch-check"
 
@@ -6081,7 +6339,7 @@ msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin"
 msgid "use .gitattributes only from the index"
 msgstr "chỉ dùng .gitattributes từ bảng mục lục"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "đ�c tên tập tin từ đầu vào tiêu chuẩn"
 
@@ -6089,7 +6347,7 @@ msgstr "đ�c tên tập tin từ đầu vào tiêu chuẩn"
 msgid "terminate input and output records by a NUL character"
 msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "chặn các báo cáo tiến trình hoạt động"
 
@@ -6101,27 +6359,27 @@ msgstr "hiển thị những Ä‘Æ°á»�ng dẫn đầu vào không khá»›p vá»›i máº
 msgid "ignore index when checking"
 msgstr "b� qua mục lục khi kiểm tra"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "không thể chỉ định các tên đư�ng dẫn với --stdin"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z chỉ hợp lý với --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "chưa chỉ ra đư�ng dẫn"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet chỉ hợp lệ với tên đư�ng dẫn đơn"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "không thể dùng cả hai tùy ch�n --quiet và --verbose"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "tùy-ch�n --non-matching chỉ hợp lệ khi dùng với --verbose"
 
@@ -6180,9 +6438,9 @@ msgid "write the content to temporary files"
 msgstr "ghi nội dung vào tập tin tạm"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "chuá»—i"
 
@@ -6227,81 +6485,81 @@ msgstr "đư�ng dẫn “%s� không có các phiên bản cần thiết"
 msgid "path '%s': cannot merge"
 msgstr "đư�ng dẫn “%s�: không thể hòa trộn"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Không thể thêm kết quả hòa trộn cho “%s�"
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "không được dùng “%s� với các đư�ng dẫn cập nhật"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "không được dùng “%s� với %s"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Không thể cập nhật các đư�ng dẫn và chuyển đến nhánh “%s� cùng một lúc."
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "đư�ng dẫn “%s� không được hòa trộn"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Không thể thực hiện reflog cho “%s�: %s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD hiện gi� tại"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "không thể cập nhật HEAD"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�ặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�ã sẵn sàng trên “%s�\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "�ã chuyển tới và đặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "�ã chuyển đến nhánh mới “%s�\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "�ã chuyển đến nhánh “%s�\n"
 
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhi�u hơn %d.\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6320,7 +6578,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6341,164 +6599,164 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "Bạn tại nhánh mà nó chưa h� được sinh ra"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiếu không hợp lệ: %s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "tham chiếu không phải là một cây:%s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "các đư�ng dẫn không thể dùng cùng với các nhánh chuyển"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "“%s� không thể được sử dụng với các nhánh chuyển"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "“%s� không thể được dùng với “%s�"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s�"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "nhánh"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "tạo và checkout một nhánh mới"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "tạo/đặt_lại và checkout một nhánh"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "r�i b� HEAD tại lần chuyển giao theo tên"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "đặt thông tin thượng nguồn cho nhánh mới"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr ""
 "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr ""
 "lấy ra (checkout) phiên bản của chúng h� cho các tập tin chưa được hòa trộn"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "ép buộc lấy ra (b� đi những thay đổi nội bộ)"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "cập nhật các tập tin bị b� qua (mặc định)"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "không giới hạn đặc tả đư�ng dẫn thành chỉ các mục thưa thớt"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "ép buộc báo cáo tiến triển công việc"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Các tùy ch�n -b, -B và --orphan loại từ lẫn nhau"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "Thiếu tên nhánh; hãy thử -b"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "đư�ng dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "“%s� không phải là một lần chuyển giao và một nhánh'%s� không thể được tạo "
 "từ đó"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach không nhận một đối số đư�ng dẫn “%s�"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6597,7 +6855,7 @@ msgstr "Ch�n mục muốn xóa"
 msgid "Remove %s [y/N]? "
 msgstr "Xóa b� “%s� [y/N]? "
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "Tạm biệt.\n"
@@ -6620,11 +6878,11 @@ msgstr ""
 "help                - hiển thị chính trợ giúp này\n"
 "?                   - trợ giúp dành cho ch�n bằng cách nhắc"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** Lệnh ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "Gi� thì sao"
 
@@ -6653,8 +6911,8 @@ msgstr "d�n bằng kiểu tương tác"
 msgid "remove whole directories"
 msgstr "gỡ b� toàn bộ thư mục"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6692,146 +6950,146 @@ msgstr ""
 "clean.requireForce mặc định được đặt là true và không đưa ra tùy ch�n -i, -n "
 "mà cũng không -f; từ chối lệnh d�n dẹp (clean)"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<các-tùy-ch�n>] [--] <kho> [<t.mục>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "không tạo một checkout"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "tạo kho thuần"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "tạo kho bản sao (ý là kho thuần)"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "để nhân bản từ kho nội bộ"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "cài đặt đây là kho chia sẻ"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "đặc-tả-đư�ng-dẫn"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "khởi tạo mô-đun-con trong bản sao"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "số lượng mô-đun-con được nhân bản đồng th�i"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "thư-mục-mẫu"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "kho tham chiếu"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "chỉ dùng --reference khi nhân bản"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "tên"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "dùng <tên> thay cho “origin� để theo dõi thượng nguồn"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "đư�ng dẫn đến git-upload-pack trên máy chủ"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "độ-sâu"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "th�i-gian"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "tạo bản sao không đầy đủ từ th�i điểm đã cho"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "điểm xét duyệt"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy v� sau không "
 "theo chúng nữa"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "m�i mô-đun-con nhân bản sẽ là shallow (nông)"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "khóa=giá_trị"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "đặt cấu hình bên trong một kho chứa mới"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "chỉ dùng địa chỉ IPv4"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "chỉ dùng địa chỉ IPv6"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6839,42 +7097,42 @@ msgstr ""
 "Không đoán được thư mục tên là gì.\n"
 "Vui lòng chỉ định tên một thư mục trên dòng lệnh"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "thông tin: không thể thêm thay thế cho “%s�: %s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "gặp lỗi khi lấy thông tin thống kê v� %s\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "gặp lỗi khi tạo được liên kết m�m %s"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "gặp lỗi khi sao chép tập tin và “%s�"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "hoàn tất.\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6884,99 +7142,99 @@ msgstr ""
 "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status�\n"
 "và thử lấy ra với lệnh “git checkout -f HEAD�\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "không thể cập nhật %s"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "refers HEAD máy chủ  chỉ đến ref không tồn tại, không thể lấy ra.\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "không thể lấy ra (checkout) cây làm việc"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "không thể ghi các tham số vào tập tin cấu hình"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "không thể đóng gói để d�n dẹp"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "không thể b� liên kết tập tin thay thế tạm th�i"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "Có quá nhi�u đối số."
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "tùy ch�n --bare và --origin %s xung khắc nhau."
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "tùy ch�n --bare và --separate-git-dir xung khắc nhau."
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chứa “%s� chưa tồn tại"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "độ sâu %s không phải là một số nguyên dương"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "đư�ng dẫn đích “%s� đã có từ trước và không phải là một thư mục rỗng."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "cây làm việc “%s� đã sẵn tồn tại rồi."
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "không thể tạo các thư mục dẫn đầu của “%s�"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "không thể tạo cây thư mục làm việc dir “%s�"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "�ang nhân bản thành kho chứa bare “%s�…\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "�ang nhân bản thành “%s�…\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6984,36 +7242,41 @@ msgstr ""
 "nhân bản --recursive không tương thích với cả hai --reference và --reference-"
 "if-able"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
 "thế."
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
 "thế."
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+"--filter bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguồn là nông, nên b� qua --local"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local bị l� đi"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
 
@@ -7049,74 +7312,15 @@ msgstr "Chèn thêm khoảng trắng giữa các cột"
 msgid "--command must be the first argument"
 msgstr "--command phải là đối số đầu tiên"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<các-tùy-ch�n>] [--] <pathspec>…"
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<các-tùy-ch�n>] [--] <pathspec>…"
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
-"sở\n"
-"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
-"xác không.\n"
-"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
-"trên\n"
-"một cách rõ ràng. Chạy lệnh sau đây là theo các hướng dẫn trong bộ soạn "
-"thảo\n"
-"để chỉnh sửa tập tin cấu hình của mình:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho\n"
-"lần chuyển giao này với lệnh:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ "
-"sở\n"
-"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính "
-"xác không.\n"
-"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin "
-"trên một cách rõ ràng:\n"
-"\n"
-"    git config --global user.name \"Tên của bạn\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần "
-"chuyển giao này với lệnh:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7129,7 +7333,7 @@ msgstr ""
 "hoặc là bạn gỡ b� các lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
 "\"git reset HEAD^\".\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7144,11 +7348,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Nếu không được thì dùng lệnh \"git reset\"\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7164,63 +7368,63 @@ msgstr ""
 "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
 "những lần chuyển giao còn lại.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "không thể tạo bảng mục lục tạm th�i"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "gặp lỗi khi thêm bằng cách tương"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "không thể cập nhật bảng mục lục tạm th�i"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "không đ�c được bảng mục lục"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục tạm th�i"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "lần chuyển giao “%s� thiếu phần tác giả ở đầu"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "lần chuyển giao “%s� có phần tác giả ở đầu dị dạng"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "đối số cho --author bị dị hình"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7228,38 +7432,38 @@ msgstr ""
 "không thể ch�n một ký tự ghi chú cái mà không được dùng\n"
 "trong phần ghi chú hiện tại"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(đang đ�c thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "không thể đ�c nhật ký từ đầu vào tiêu chuẩn"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "không đ�c được tệp nhật ký “%s�"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "không thể đ�c SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "không thể đ�c MERGE_MSG"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "không thể ghi mẫu chuyển giao"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7274,7 +7478,7 @@ msgstr ""
 "\t%s\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7289,7 +7493,7 @@ msgstr ""
 "\t%s\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7300,7 +7504,7 @@ msgstr ""
 "bắt đầu bằng “%c� sẽ được b� qua, nếu phần chú thích rỗng sẽ hủy b� lần "
 "chuyển giao.\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7312,152 +7516,156 @@ msgstr ""
 "bắt đầu bằng “%c� sẽ được b� qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
 "Phần chú thích này nếu trống rỗng sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTác giả:           %.*s <%.*s>"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgày tháng:        %s"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgư�i chuyển giao: %.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "Không đ�c được bảng mục lục"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Xin hãy cung cấp l�i chú giải hoặc là dùng tùy ch�n -m hoặc là -F.\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author “%s� không phải là “H� và tên <thư điện tửl>� và không khớp bất kỳ "
 "tác giả nào sẵn có"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Chế độ b� qua không hợp lệ “%s�"
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s�"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "hai tùy ch�n -long và -z không tương thích với nhau"
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Sử dụng cả hai tùy ch�n --reset-author và --author không hợp lý"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ� cả."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ�."
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
 "bổ�."
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Các tùy ch�n --squash và --fixup không thể sử dụng cùng với nhau"
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 "Chỉ được dùng một trong số tùy ch�n trong số các tùy ch�n -c/-C/-F/--fixup"
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "Tùy ch�n -m không thể được tổ hợp cùng với -c/-C/-F/--fixup."
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Tùy ch�n -m không thể được tổ hợp cùng với -c/-C/-F."
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "--reset-author chỉ có thể được sử dụng với tùy ch�n -C, -c hay --amend."
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Chỉ một trong các tùy ch�n --include/--only/--all/--interactive/--patch được "
 "sử dụng."
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "Không đư�ng dẫn với các tùy ch�n --include/--only không hợp lý."
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Chế độ d�n dẹp không hợp lệ %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "Các đư�ng dẫn với tùy ch�n -a không hợp lý."
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "hiển thị trạng thái ở dạng súc tích"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "hiển thị thông tin v� tạm cất"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "tính đầy đủ giá trị trước/sau"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "phiên bản"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "kết xuất dạng máy-có-thể-đ�c"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "chấm dứt các mục bằng NUL"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "chế độ"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "hiển thị các tập tin chưa được theo dõi  dấu vết, các chế độ tùy ch�n:  all, "
 "normal, no. (Mặc định: all)"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -7465,11 +7673,11 @@ msgstr ""
 "hiển thị các tập tin bị b� qua, các chế độ tùy ch�n: traditional, matching, "
 "no. (Mặc định: traditional)"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7477,215 +7685,190 @@ msgstr ""
 "b� qua các thay đổi trong mô-đun-con, tùy ch�n khi: all, dirty, untracked. "
 "(Mặc định: all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Không hỗ trỡ tổ hợp các tham số các tập tin bị b� qua và không được theo dõi"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr ""
-"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "đã r�i kh�i HEAD"
-
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr " (root-commit)"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "Các tùy ch�n ghi chú commit"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "đ�c chú thích từ tập tin"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "chú thích"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "chú thích của lần chuyển giao"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "lần_chuyển_giao"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "dùng l�i nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ "
 "ra"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "lần chuyển giao nhận tôi là tác giả (được dùng với tùy ch�n -C/-c/--amend)"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "(nên dùng) thêm dòng Signed-off-by:"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "mặc định"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "làm thế nào để cắt b� khoảng trắng và #ghichú từ mẩu tin nhắn"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "ký lần chuyển giao dùng GPG"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "chuyển giao tất cả các tập tin có thay đổi"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "thêm các tập-tin bằng tương tác"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "vòng qua móc (hook) pre-commit và commit-msg"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "hiển thị xem cái gì có thể được chuyển giao"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "“tu bổ� (amend) lần commit trước"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "ok để ghi lại một thay đổi trống rỗng"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "ok để ghi các thay đổi với l�i nhắn trống rỗng"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tập tin MERGE_HEAD sai h�ng (%s)"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "không thể đ�c MERGE_MODE"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "không thể đ�c phần chú thích (message) của lần chuyển giao: %s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Bãi b� việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 "�ang b� qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
 "(message).\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7914,22 +8097,22 @@ msgstr "thẻ được chú giải %s không có tên nhúng"
 msgid "tag '%s' is really '%s' here"
 msgstr "thẻ “%s� đã thực sự ở đây “%s� rồi"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "không có thẻ nào khớp chính xác với “%s�"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "Không có tham chiếu hay thẻ khớp đúng, đang tìm kiếm mô tả\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "việc tìm kiếm đã kết thúc tại %s\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7938,7 +8121,7 @@ msgstr ""
 "Không có thẻ được chú giải nào được mô tả là “%s�.\n"
 "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7947,12 +8130,12 @@ msgstr ""
 "Không có thẻ có thể mô tả “%s�.\n"
 "Hãy thử --always, hoặc tạo một số thẻ."
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "đã xuyên %lu qua lần chuyển giao\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7961,90 +8144,90 @@ msgstr ""
 "tìm thấy nhi�u hơn %i thẻ; đã liệt kê %i cái gần\n"
 "đây nhất b� đi tìm kiếm tại %s\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "mô tả %s\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Không phải tên đối tượng %s hợp lệ"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s không phải là một lần commit cũng không phải blob"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "tìm các thẻ mà nó đến trước lần chuyển giao"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "dùng ref bất kỳ"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "dùng thẻ bất kỳ, cả khi “unannotated�"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "luôn dùng định dạng dài"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "chỉ theo cha mẹ đầu tiên"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "chỉ xuất những gì khớp chính xác"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "không coi rằng các thẻ khớp với <mẫu>"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "dấu"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "thêm <dấu> trên cây thư mục làm việc bị h�ng (mặc định \"-broken\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long là xung khắc với tùy ch�n --abbrev=0"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty là xung khắc với các tùy ch�n commit-ish"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken là xung khắc với commit-ishes"
 
@@ -8233,97 +8416,101 @@ msgstr "�p dụng refspec cho refs đã xuất"
 msgid "anonymize output"
 msgstr "kết xuất anonymize"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<các-tùy-ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<các-tùy-ch�n>] [<nhóm>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<các-tùy-ch�n>] [(<kho> | <nhóm>)…]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<các-tùy-ch�n>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "lấy v� từ tất cả các máy chủ"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "đư�ng dẫn đến gói tải lên trên máy chủ cuối"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "ép buộc ghi đè lên nhánh nội bộ"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "lấy từ nhi�u máy chủ cùng lúc"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "không lấy tất cả các thẻ (--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "số lượng mô-đun-con được lấy đồng th�i"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "cắt cụt (prune) các nhánh “remote-tracking� không còn tồn tại trên máy chủ "
 "nữa"
 
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
+
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "khi-cần"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "đi�u khiển việc lấy v� đệ quy trong các mô-đun-con"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "giữ lại gói đã tải v�"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "cho phép cập nhật th.chiếu HEAD"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "làm sâu hơn lịch sử của bản sao"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên th�i gian"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "chuyển đổi hoàn toàn sang kho git"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "tmục"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "soạn sẵn cái này cho kết xuất đư�ng dẫn mô-đun-con"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8331,89 +8518,89 @@ msgstr ""
 "mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập "
 "tin cấu hình config)"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "chỉ ra refmap cần lấy v�"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "Không tìm thấy đối tượng %s"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[đã cập nhật]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[Bị từ chối]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "không thể fetch (lấy) v� nhánh hiện hành"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[cập nhật thẻ]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "không thể cập nhật tham chiếu nội bộ"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[thẻ mới]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[nhánh mới]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[ref (tham chiếu) mới]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "cưỡng bức cập nhật"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "không-phải-chuyển-tiếp-nhanh"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "Từ %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8422,52 +8609,59 @@ msgstr ""
 "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
 " “git remote prune %s� để b� đi những nhánh cũ, hay bị xung đột"
 
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sẽ trở thành không đầu (không được quản lý))"
 
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s đã trở thành không đầu (không được quản lý))"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[đã xóa]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(không)"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
 "trần (bare)"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Tùy ch�n \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Tùy ch�n \"%s\" bị b� qua với %s\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "�ang lấy “%s� v�\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "không thể “%s� v�"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng core."
+"partialClone"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8475,40 +8669,40 @@ msgstr ""
 "Chưa chỉ ra kho chứa máy chủ.  Xin hãy chỉ định hoặc là URL hoặc\n"
 "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy v�)."
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "Bạn phải định rõ tên thẻ."
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "Các tùy ch�n--deepen và --depth loại từ lẫn nhau"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "tùy ch�n --depth và --unshallow không thể sử dụng cùng với nhau"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "lệnh lấy v� \"fetch --all\" không lấy đối số kho chứa"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "lệnh lấy v� \"fetch --all\" không hợp lý với refspecs"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Việc lấy v� cả một nhóm và chỉ định refspecs không hợp lý"
 
@@ -8577,7 +8771,7 @@ msgstr "trích dẫn để phù hợp cho Tcl"
 msgid "show only <n> matched refs"
 msgstr "hiển thị chỉ <n> tham chiếu khớp"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "các màu định dạng lưu tâm"
 
@@ -8601,63 +8795,63 @@ msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển gi
 msgid "print only refs which don't contain the commit"
 msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "�ang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các-tùy-ch�n>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "hiển thị các đối tượng không thể đ�c được"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "hiển thị các đối tượng không được quản lý"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes�"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes� (mặc định)"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "cho phép kiểm tra hạn chế hơn"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "hiển thị quá trình"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "hiển thị tên chi tiết cho các đối tượng đ�c được"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "�ang kiểm tra các đối tượng"
 
@@ -8702,33 +8896,33 @@ msgstr "cẩn thận hơn nữa (tăng th�i gian chạy)"
 msgid "enable auto-gc mode"
 msgstr "bật chế độ auto-gc"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Gặp lỗi khi phân tích giá trị gc.logexpiry %s"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Tự động đóng gói kho chứa trên n�n hệ thống để tối ưu hóa hiệu suất làm "
 "việc.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể v� cách d�n dẹp kho git.\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8736,7 +8930,7 @@ msgstr ""
 "gc đang được thực hiện trên máy “%s� pid %<PRIuMAX> (dùng --force nếu không "
 "phải thế)"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8747,12 +8941,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<các-tùy-ch�n>] [-e] <mẫu> [<rev>…] [[--] <đư�ng-dẫn>…]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -8761,246 +8955,246 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "không hỗ trợ đa tuyến, b� qua %s"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "không thể đ�c cây (%s)"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "không thể thực hiện lệnh grep (l�c tìm) từ đối tượng thuộc kiểu %s"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "chuyển đến “%c� cần một giá trị bằng số"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "tìm trong nội dung không được quản lý bởi git"
 
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "các tập tin bị b� qua được chỉ định thông qua “.gitignore�"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "hiển thị những dòng không khớp với mẫu"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "phân biệt HOA/thư�ng"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "chỉ khớp mẫu tại đư�ng ranh giới từ"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "xử lý tập tin nhị phân như là dạng văn bản thư�ng"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "không khớp mẫu trong các tập tin nhị phân"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "xử lý tập tin nhị phân với các bộ l�c “textconv�"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "hạ xuống ít nhất là mức <sâu>"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "dùng biểu thức chính qui POSIX có mở rộng"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "diễn dịch các mẫu như là chuỗi cố định"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "sử dụng biểu thức chính quy tương thích Perl"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "hiển thị số của dòng"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "không hiển thị tên tập tin"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "hiển thị các tên tập tin"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "đồng nghĩa với --files-with-matches"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "thêm NUL vào sau tên tập tin"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "tô sáng phần khớp mẫu"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr ""
 "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "hiển thị <n> dòng nội dung trước khớp"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "hiển thị <n> dòng nội dung sau khớp"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "dùng <n> tuyến trình làm việc"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "dạng viết tắt của -C S�"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "hiển thị hàm bao quanh"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "đ�c mẫu từ tập-tin"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "match <mẫu>"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "tổ hợp mẫu được chỉ ra với tùy ch�n -e"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep� (tìm kiếm)"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "dàn trang"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "hiển thị các tập tin khớp trong trang giấy"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "cho phép g�i grep(1) (bị b� qua bởi lần dịch này)"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "chưa chỉ ra mẫu."
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "không thể phân giải điểm xét duyệt: %s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "số tuyến chỉ ra không hợp lệ (%d)"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "không hỗ trợ đa tuyến, b� qua --threads"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "tùy ch�n không được hỗ trợ với --recurse-submodules."
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached hay --untracked không được sử dụng với --no-index."
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết."
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "cả hai --cached và các cây phải được chỉ ra."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -9008,36 +9202,36 @@ msgstr ""
 "git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] "
 "[--] <tập-tin>…"
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "kiểu"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "kiểu đối tượng"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "ghi đối tượng vào dữ liệu đối tượng"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "đ�c đối tượng từ đầu vào tiêu chuẩn stdin"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "lưu các tập tin mà nó không có các bộ l�c"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng h�ng để mà gỡ lỗi Git"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "xử lý tập tin như là nó đang ở thư mục này"
 
@@ -9169,150 +9363,150 @@ msgstr "“%s� được đặt bí danh thành “%s�"
 msgid "usage: %s%s"
 msgstr "cách dùng: %s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "không thể mở %s"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "kiểu đối tượng không khớp tại %s"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "Không thể lấy v� đối tượng cần %s"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "không thể đi�n thêm vào %d byte"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "gặp kết thúc tập tin EOF quá sớm"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "lỗi đ�c ở đầu vào"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "sử dụng nhi�u hơn số lượng byte mà nó sẵn có"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "gói đã vượt quá cỡ tối đa được phép"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "không thể mở packfile “%s�"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "chữ ký cho gói không khớp"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "xả nén trả v� %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "không hiểu kiểu đối tượng %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "không thể chạy hàm pread cho tập tin gói"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "sự mâu thuẫn xả nén nghiêm tr�ng"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SỰ VA CHẠM SHA1 �à XẢY RA VỚI %s!"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "không thể đ�c %s"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "không thể đ�c thông tin đối tượng sẵn có %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "không thể đ�c đối tượng đã tồn tại %s"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "đối tượng blob không hợp lệ %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "%s không hợp lệ"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "Lỗi trong đối tượng"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "gặp lỗi khi áp dụng delta"
 
@@ -9380,75 +9574,79 @@ msgstr "không thể xả nén đối tượng nối thêm (%d)"
 msgid "local object %s is corrupt"
 msgstr "đối tượng nội bộ %s bị h�ng"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "gặp lỗi trong khi đóng tập tin gói"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "tên tập tin tập tin gói “%s� không được kết thúc bằng đuôi “.pack�"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "không thể ghi tập tin giữ lại “%s�"
+msgid "cannot write %s file '%s'"
+msgstr "không thể ghi %s tập tin “%s�"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "không thể đóng tập tin giữ lại đã được ghi “%s�"
+msgid "cannot close written %s file '%s'"
+msgstr "không thể đóng tập tin được ghi %s “%s�"
+
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "gặp lỗi trong khi đóng tập tin gói"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "không thể lưu tập tin gói"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "không thể lưu trữ tập tin ghi mục lục"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "sai pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Không thể mở tập tin gói đã sẵn có “%s�"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Không thể mở tập tin idx của gói cho “%s�"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "không delta: %d đối tượng"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "chi�u dài xích = %d: %lu đối tượng"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "tên tập tin tập tin gói “%s� không được kết thúc bằng đuôi “.pack�"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "Không thể quay lại cwd"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "%s sai"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin không thể được dùng mà không có --stdin"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin cần một kho git"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "dùng tùy ch�n --verify mà không đưa ra tên packfile"
 
@@ -9632,120 +9830,120 @@ msgstr "--trailer cùng với --only-input không hợp lý"
 msgid "no input file given for in-place editing"
 msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<các-tùy-ch�n>] [<vùng-xem-xét>] [[--] <đư�ng-dẫn>…]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<các-tùy-ch�n>] <đối-tượng>…"
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "tùy ch�n--decorate không hợp lệ: %s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "chặn m�i kết xuất từ diff"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "hiển thị mã nguồn"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "Sử dụng tập tin ánh xạ thư"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "các tùy ch�n trang trí"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kết xuất cuối cùng: %d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "Không thể đ�c đối tượng %s"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Không nhận ra kiểu: %d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "tên của thư mục kết xuất quá dài"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Không thể mở tập tin miếng vá: %s"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "Cần chính xác một vùng."
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "Không phải là một vùng."
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "“Cover letter� cần cho định dạng thư"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<các-tùy-ch�n>] [<kể-từ> | <vùng-xem-xét>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "Hai thư mục kết xuất?"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Không hiểu lần chuyển giao %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Gặp lỗi khi phân giải “%s� như là một tham chiếu hợp lệ."
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "Không tìm thấy n�n hòa trộn chính xác."
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9756,227 +9954,227 @@ msgstr ""
 "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao n�n bằng\n"
 "\"--base=<base-commit-id>\" một cách thủ công."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "Gặp lỗi khi tìm n�n hòa trộn chính xác."
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "lần chuyển giao n�n không là tổ tiên của danh sách điểm xét duyệt"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "lần chuyển giao n�n không được trong danh sách điểm xét duyệt"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "không thể lấy mã miếng vá"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "dùng [V�] ngay cả với các miếng vá phức tạp"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "hiển thị miếng vá ra đầu ra chuẩn"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch�"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Dùng [RFC V�] thay cho [V�]"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Dùng [<ti�n-tố>] thay cho [V�]"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "lưu các tập tin kết quả trong <t.mục>"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [V�]"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "không kết xuất diff (những khác biệt) nhị phân"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "xuất m�i mã băm all-zero trong phần đầu From"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "L�i nhắn"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "đầu đ� thư"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "thêm đầu đ� thư"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "thêm To: đầu đ� thư"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đ� thư"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "thụt l�"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "đặt “�ịa chỉ gửi� thành <thụ l�> (hoặc thụt l� ngư�i commit nếu b� quên)"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "dùng thư đầu tiên để trả l�i <message-id>"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "ranh giá»›i"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phép luồng l�i nhắn, kiểu: “shallow�, “deep�"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "lần_chuyển_giao_n�n"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "add trước hết đòi h�i thông tin cây tới sê-ri miếng vá"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "thêm chữ ký từ một tập tin"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "không hiển thị các tên tập tin của miếng vá"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "dòng thụt l� không hợp lệ: %s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "-n và  -k loại từ lẫn nhau."
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc và -k xung khắc nhau."
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "đầu ra chuẩn, hay thư mục, ch�n cái nào?"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Không thể tạo thư mục “%s�"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "không thể đ�c tập tin chữ ký “%s�"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "�ang tạo các miếng vá"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10133,7 +10331,7 @@ msgstr "lấy url.<base>.insteadOf vào trong tài khoản"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "thoát với mã là 2 nếu không tìm thấy tham chiếu nào khớp"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
 
@@ -10178,184 +10376,184 @@ msgstr "liệt kê cây mục tin; không chỉ thÆ° mục hiện hành (ngụ Ã
 msgid "empty mbox: '%s'"
 msgstr "mbox trống rỗng: “%s�"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<các-tùy-ch�n>] [<commit>…]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "switch “m� yêu cầu một giá trị"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Không tìm thấy chiến lược hòa trộn “%s�.\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "Các chiến lược sẵn sàng là:"
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "sửa chú thích trước khi chuyển giao"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "b� qua nếu chuyển-tiếp-nhanh không thể được"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "chiến lược"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "chiến lược hòa trộn sẽ dùng"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "tùy_ch�n=giá_trị"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "tùy ch�n cho chiến lược hòa trộn đã ch�n"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
 "nhanh)"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "bãi b� quá trình hòa trộn hiện tại đang thực hiện"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "cho phép hòa trộn lịch sử không liên quan"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "thẩm tra móc (hook) commit-msg"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "không phải là một đối tượng hợp lệ: %s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " (không có gì để squash)"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- không cập nhật HEAD\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Không có l�i chú thích hòa trộn -- nên không cập nhật HEAD\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "“%s� không chỉ đến một lần chuyển giao nào cả"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "Không cầm nắm gì ngoài hai head hòa trộn"
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Không hiểu tùy ch�n cho merge-recursive: -X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "không thể ghi %s"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đ�c từ “%s�"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit� để hoàn tất "
 "việc hòa trộn.\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10373,71 +10571,71 @@ msgstr ""
 "rá»—ng\n"
 "sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt v�i.\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
 "quả.\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "không phải nhánh hiện hành"
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "Không có máy chủ cho nhánh hiện hành."
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Không nhánh mạng theo dõi cho %s từ %s"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Giá trị sai “%s� trong biến môi trư�ng “%s�"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort không nhận các đối số"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "Ở đây không có lần hòa trộn nào được hủy b� giữa chừng cả (thiếu MERGE_HEAD)."
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue không nhận đối số"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10445,7 +10643,7 @@ msgstr ""
 "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
 "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10453,115 +10651,115 @@ msgstr ""
 "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
 "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Bạn không thể kết hợp --squash với --no-ff."
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Lần chuyển giao %s không có chữ ký GPG."
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "từ chối hòa trộn lịch sử không liên quan"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "�ã cập nhật rồi."
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "�ang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�ang thử hòa trộn kiểu “trivial in-index�…\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "�ã cập nhật rồi. Yeeah!"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang b� qua."
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "�ang tua lại cây thành th�i xa xưa…\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�ang thử chiến lược hòa trộn %s…\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10717,72 +10915,72 @@ msgstr "%.*s trong bảng mục lục"
 msgid "force move/rename even if target exists"
 msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "b� qua các lỗi liên quan đến di chuyển, đổi tên"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "có đích “%s� nhưng đây không phải là một thư mục"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "�ang kiểm tra việc đổi tên của “%s� thành “%s�\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "nguồn sai"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "không thể di chuyển một thư mục vào trong chính nó được"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "không di chuyển được thư mục thông qua tập tin"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "thư mục nguồn là trống rỗng"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "không nằm dưới sự quản lý mã nguồn"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "đích đã tồn tại sẵn rồi"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "đang ghi đè lên “%s�"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Không thể ghi đè"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "Nhi�u nguồn cho cùng một đích"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "thư mục đích không tồn tại"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, nguồn=%s, đích=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�ổi tên %s thành %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gặp lỗi khi đổi tên “%s�"
@@ -10974,12 +11172,12 @@ msgstr "không thể ghi đối tượng ghi chú (note)"
 msgid "the note contents have been left in %s"
 msgstr "nội dung ghi chú còn lại %s"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "không thể đ�c “%s�"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "không thể mở hay đ�c “%s�"
@@ -11226,7 +11424,7 @@ msgstr "cố gắng gỡ b� một note chưa từng tồn tại không phải
 msgid "read object names from the standard input"
 msgstr "đ�c tên đối tượng từ thiết bị nhập chuẩn"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "không gỡ b�, chỉ hiển thị"
 
@@ -11261,183 +11459,187 @@ msgstr ""
 "git pack-objects [các-tùy-ch�n…] <base-name> [< <danh-sách-ref> | < <danh-"
 "sách-đối-tượng>]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "lỗi giải nén (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "tắt ghi bitmap, các gói bị chia nh� bởi vì pack.packSizeLimit"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "�ang ghi lại các đối tượng"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "�ang nén các đối tượng"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "giá trị cho --missing không hợp lệ"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "phiên bản mục lục không được hỗ trợ %s"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiên bản mục lục sai “%s�"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "không hiển thị bộ đo tiến trình"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "hiển thị bộ đo tiến trình"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "phiên bản[,offset]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "kcíh thước tối đa cho tập tin gói được tạo"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "b� qua các đối tượng vay mượn từ kho đối tượng thay thế"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "b� qua các đối tượng đóng gói"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "độ dài tối đa của chuỗi móc xích “delta� được phép trong gói kết quả"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "dùng lại các delta sẵn có"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "dùng lại các đối tượng sẵn có"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "dùng các đối tượng OFS_DELTA"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "không thể tạo kết xuất gói trống rỗng"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr " đ�c tham số “revision� từ thiết bị nhập chuẩn"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "bao gồm các đối tượng có thể đ�c được từ bất kỳ tham chiếu nào"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "xuất gói ra đầu ra tiêu chuẩn"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "giữ lại các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "pack mất các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 "xả nén (gỡ kh�i gói) các đối tượng không thể đ�c được mới hơn <th�i-gian>"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "tạo gói nhẹ"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "tạo gói để phù hợp cho lấy v� nông (shallow)"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "b� qua các gói mà nó có tập tin .keep đi kèm"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "mức nén gói"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "không ẩn các lần chuyển giao bởi “grafts�"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "xử lý cho thiếu đối tượng"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "�ang đếm các đối tượng"
 
@@ -11465,15 +11667,19 @@ msgstr "�ang gỡ các đối tượng trùng lặp"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <th�i-gian>] [--] [<head>…]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "các đối tượng hết hạn cũ hơn khoảng <th�i gian>"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "giới hạn giao đến các đối tượng nằm ngoài các tập tin gói hứa hẹn"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
 
@@ -11576,7 +11782,7 @@ msgstr "Xem git-pull(1) để biết thêm chi tiết."
 msgid "<remote>"
 msgstr "<máy chủ>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<nhánh>"
@@ -11600,29 +11806,29 @@ msgstr ""
 "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s�\n"
 "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy v�."
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "b� qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "tùy ch�n --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "�ang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
 "bảng mục lục."
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "pull vá»›i rebase"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11633,7 +11839,7 @@ msgstr ""
 "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
 "lần chuyển giaot %s."
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11651,15 +11857,15 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Không thể hòa trộn nhi�u nhánh vào trong một head trống rỗng."
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhi�u nhánh."
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ"
@@ -12050,39 +12256,43 @@ msgstr "git rebase--helper [<các-tùy-ch�n>]"
 msgid "keep empty commits"
 msgstr "giữ lại các lần chuyển giao rỗng"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "chấp nhận chuyển giao mà không ghi chú gì"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "tiếp tục cải tổ"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "bãi b� việc cải tổ"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "tạo văn lệnh rebase"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "khai triển mã chuyển giao trong danh sách cần làm"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "kiểm tra danh sách cần làm"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "b� qua các lệnh cậy (pick) không cần thiết"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "sắp xếp lại các dòng fixup/squash"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "chèn các lệnh thực thi trong danh sách cần làm"
 
@@ -12090,7 +12300,7 @@ msgstr "chèn các lệnh thực thi trong danh sách cần làm"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thư-mục-git>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12120,7 +12330,7 @@ msgstr ""
 "�ể chấm dứt l�i nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
 "biến cấu hình “receive.denyCurrentBranch� thành “refuse�."
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12141,15 +12351,15 @@ msgstr ""
 "\n"
 "�ể chấm dứt l�i nhắn này, bạn hãy đặt nó thành “refuse�."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "im lặng"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "Bạn phải chỉ định thư mục."
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "“%s� không phải là dấu th�i gian hợp lệ"
@@ -12666,87 +12876,87 @@ msgstr ""
 "Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
 "--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "đóng gói m�i thứ trong một gói đơn"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "giống với -a, và chỉnh sửa các đối tượng không đ�c được thiếu sót"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "xóa b� các gói dư thừa, và chạy git-prune-packed"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "chuyển --no-reuse-delta cho git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "chuyển --no-reuse-object cho git-pack-objects"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "không chạy git-update-server-info"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "chuyển --local cho git-pack-objects"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "ghi mục lục ánh xạ"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "ngày ước tính"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "với -A, các đối tượng cũ hơn khoảng th�i gian này thì không bị mất"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "với -a, đóng gói lại các đối tượng không thể đ�c được"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "kích thước cửa sổ được dùng cho nén “delta�"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "giới hạn độ sâu tối đa của “delta�"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "giới hạn số lượng tối đa tuyến trình"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "kích thước tối đa cho từng tập tin gói"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable và -A xung khắc nhau"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "gặp lỗi khi gỡ b� “%s�"
@@ -12829,11 +13039,11 @@ msgstr "thay đổi cha mẹ của lần chuyển giao"
 msgid "replace the ref if it exists"
 msgstr "thay thế tham chiếu nếu nó đã sẵn có"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "đừng in đẹp các nội dung cho --edit"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "dùng định dạng này"
 
@@ -12893,101 +13103,105 @@ msgstr "Gặp lỗi khi tìm cây của HEAD."
 msgid "Failed to find tree of %s."
 msgstr "Gặp lỗi khi tìm cây của %s."
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD hiện gi� tại %s"
 
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn."
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "đặt lại (reset) HEAD và bảng mục lục"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "chỉ đặt lại (reset) HEAD"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "đặt lại HEAD, bảng mục lục và cây làm việc"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr "chỉ ghi lại những đư�ng dẫn thực sự sẽ được thêm vào sau này"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Gặp lỗi khi phân giải “%s� như là điểm xét duyệt hợp lệ."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Gặp lỗi khi phân giải “%s� như là một cây (tree) hợp lệ."
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch xung khắc với --{hard,mixed,soft}"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed với các đư�ng dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git "
 "reset -- <đư�ng_dẫn>�."
 
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Không thể thực hiện lệnh %s reset với các đư�ng dẫn."
 
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset không được phép trên kho thuần"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N chỉ được dùng khi có --mixed"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "Những thay đổi được đưa ra kh�i bệ phóng sau khi reset:"
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s�."
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "l�c đối tượng yêu cầu --objects"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "giá trị sparse không hợp lệ “%s�"
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "không thể tổ hợp --use-bitmap-index với l�c đối tượng"
 
@@ -13090,10 +13304,6 @@ msgstr "nối thêm tên lần chuyển giao"
 msgid "preserve initially empty commits"
 msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
@@ -13435,35 +13645,39 @@ msgstr "giữ và xóa b� m�i dòng bắt đầu bằng ký tự ghi chú"
 msgid "prepend comment character and space to each line"
 msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "Không có tham chiếu nào như thế: %s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote takes không nhận tham số"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "không thể cắt b� một thành phần ra kh�i “%s� url"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "điểm neo thay thế cho các đư�ng dẫn tương đối"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Không tìm thấy url cho đư�ng dẫn mô-đun-con “%s� trong .gitmodules"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13472,56 +13686,56 @@ msgstr ""
 "không thể tìm thấy cấu hình “%s�. Coi rằng kho này là thượng nguồn có quy�n "
 "sở hữu chính nó."
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Gặp lỗi khi đăng ký url cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Mô-đun-con “%s� (%s) được đăng ký cho đư�ng dẫn “%s�\n"
 
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s�\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
 msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đư�ng dẫn "
 "“%s�"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
 msgstr "Chặn két xuất tình trạng mô-đun-con"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -13529,55 +13743,143 @@ msgstr ""
 "Dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
 "Ä‘un-con"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
 msgstr "đệ quy vào trong mô-đun-con lồng nhau"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name </đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "url mô-đun-con đồng bộ hóa cho “%s�\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "gặp lỗi khi đăng ký url cho đư�ng dẫn mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "Chặn kết xuất cho đồng bộ url mô-đun-con"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "�ệ quy vào trong các mô-đun-con lồng nhau"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [</đư�ng/dẫn>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"Cây làm việc mô-đun-con “%s� có chứa thư mục .git (dùng “rm -rf� nếu bạn "
+"thực sự muốn gỡ b� nó cùng với toàn bộ lịch sử của chúng)"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Cây làm việc mô-đun-con “%s� chứa các thay đổi nội bộ; hãy dùng “-f� để loại "
+"b� chúng đi"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "�ã xóa thư mục “%s�\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Không thể gỡ b� cây làm việc mô-đun-con “%s�\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "không thể tạo thư mục mô-đun-con rỗng “%s�"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Mô-đun-con “%s� (%s) được đăng ký cho đư�ng dẫn “%s�\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "Gỡ b� cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "B� đăng ký tất cả các trong mô-đun-con"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--]  [</đư�ng/dẫn>…]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Dùng “--all� nếu bạn thực sự muốn hủy khởi tạo m�i mô-đun-con"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "mô-đun-con “%s� không thể thêm thay thế: %s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Giá trị “%s� cho submodule.alternateErrorStrategy không được thừa nhận"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Giá trị “%s� cho submodule.alternateLocation không được thừa nhận"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "nhân bản mô-đun-con mới vào chỗ nào"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "tên của mô-đun-con mới"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "url nơi mà nhân bản mô-đun-con từ đó"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "chi�u sâu lịch sử khi tạo bản sao"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "ép buộc tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13585,84 +13887,84 @@ msgstr ""
 "git submodule--helper clone [--prefix=</đư�ng/dẫn>] [--quiet] [--reference "
 "<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Nhân bản “%s� vào đư�ng dẫn mô-đun-con “%s� gặp lỗi"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "không thể lấy thư mục mô-đun-con cho “%s�"
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�ư�ng dẫn mô-đun-con “%s� chưa được khởi tạo"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "B� qua các mô-đun-con chưa được hòa trộn %s"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "B� qua mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Gặp lỗi khi nhân bản “%s�. Thử lại lịch trình"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Gặp lỗi khi nhân bản “%s� lần thứ hai nên bãi b�"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "đư�ng dẫn đến cây làm việc"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "đư�ng dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout hoặc không làm gì cả"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 "Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "công việc đồng th�i"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "đừng in tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 "git submodule--helper update_clone [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "giá trị cho  tham số cập nhật bị sai"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13671,20 +13973,20 @@ msgstr ""
 "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
 "dự án lại không trên bất kỳ nhánh nào"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "đệ quy vào trong mô-đun-con"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s không hỗ trợ --super-prefix"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "“%s� không phải là lệnh con submodule--helper hợp lệ"
@@ -13789,140 +14091,144 @@ msgstr "không thể ký thẻ"
 msgid "unable to write tag file"
 msgstr "không thể ghi vào tập tin lưu thẻ"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "kiểu đối tượng sai."
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "không có chú thích gì cho cho thẻ à?"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Nội dung ghi chú còn lại %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "chỉ liệt kê tên các thẻ"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "hiển thị <n> dòng cho mỗi ghi chú"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "xóa thẻ"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "thẩm tra thẻ"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "Tùy ch�n tạo thẻ"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "để chú giải cho thẻ, cần một l�i ghi chú"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "phần chú thích cho thẻ"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "ép buộc sửa thẻ lần commit"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "thẻ chú giải và ký kiểu GPG"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "dùng kháo khác để ký thẻ"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "thay thế nếu thẻ đó đã có trước"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "tạo một reflog"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "Các tùy ch�n liệt kê thẻ"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "hiển thị danh sách thẻ trong các cột"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "chỉ hiển thị các thẻ của đối tượng"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column và -n xung khắc nhau"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "tùy ch�n -n chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "tùy ch�n --contains chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "tùy ch�n --no-contains chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "tùy ch�n --points-at chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 "tùy ch�n --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "chỉ có một tùy ch�n -F hoặc -m là được phép."
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "quá nhi�u đối số"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "“%s� không phải thẻ hợp lệ."
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Thẻ “%s� đã tồn tại rồi"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "�ã cập nhật thẻ “%s� (trước là %s)\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "�ang giải nén các đối tượng"
 
@@ -14257,8 +14563,8 @@ msgid "print tag contents"
 msgstr "hiển thị nội dung của thẻ"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<các-tùy-ch�n>] <đư�ng-dẫn> [<nhánh>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<các-tùy-ch�n>] <đư�ng-dẫn> [<commit-ish>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14269,132 +14575,217 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<các-tùy-ch�n>] </đư�ng/dẫn>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <worktree> </đư�ng/dẫn/mới>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<các-tùy-ch�n>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<các-tùy-ch�n>] <worktree>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock </đư�ng/dẫn>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Gỡ b� cây làm việc/%s: không phải là thư mục hợp lệ"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Gỡ b� cây làm việc/%s: không có tập tin gitdir"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Gỡ b� cây làm việc/%s: không thể đ�c tập tin gitdir (%s)"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr "Gỡ b� cây làm việc/%s: đ�c ngắn (cần %<PRIuMAX> byte, đ�c %<PRIuMAX>)"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Gỡ b� cây làm việc/%s: tập tin gitdir không hợp lệ"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Gỡ b� cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "báo cáo các cây làm việc đã prune"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "các cây làm việc hết hạn cũ hơn khoảng <th�i gian>"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s� đã có từ trước rồi"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "không thể tạo thư mục của “%s�"
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "�ang chuẩn bị %s (định danh %s)"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "tạo nhánh mới"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "tạo hay đặt lại một nhánh"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "di chuyển cây làm việc mới"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "giữ cây làm việc mới bị khóa"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "Các tùy ch�n -b, -B, và --detach loại từ lẫn nhau"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "lý do khóa"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "%s không phải là cây làm việc"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Cây thư mục làm việc chính không thể khóa hay b� khóa được"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "“%s� đã được khóa rồi, lý do: %s"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "“%s� đã được khóa rồi"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s� chưa bị khóa"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa b�"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "“%s� là cây làm việc chính"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "không thể phác h�a ra tên đích đến “%s�"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "đích “%s� đã tồn tại rồi"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "không thể di chuyển một cây-làm-việc bị khóa"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "gặp lỗi khi chuyển “%s� sang “%s�"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "gặp lỗi khi chạy “git status� vào “%s�"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "“%s� đang bẩn, hãy dùng --force để xóa nó"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "gặp lỗi khi chạy “git status� trong “%s�, mã %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "gặp lỗi khi xóa “%s�"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "không thể gỡ b� một cây-làm-việc bị khóa, khóa vì: %s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "không thể gỡ b� một cây-làm-việc bị khóa"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "thẩm tra gặp lỗi, không thể gỡ b� một cây-làm-việc: %s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<ti�n-tố>/]"
@@ -14411,23 +14802,23 @@ msgstr "ghi đối tượng cây (tree) cho <ti�n tố> thư mục con"
 msgid "only useful for debugging"
 msgstr "chỉ hữu ích khi cần gỡ lỗi"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<các-tùy-ch�n>] </đư�ng/dẫn>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "thoát sau khi một trao đổi yêu cầu hay trả l�i đơn"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "ngắt truy�n thông sau <n> giây không hoạt động"
 
@@ -14448,6 +14839,22 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C </đư�ng/dẫn/>] [-c <tên>=<giá trị>]\n"
+"           [--exec-path[=</đư�ng/dẫn/>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=</đư�ng/dẫn/>] [--work-tree=</đư�ng/dẫn/>] [--"
+"namespace=<tên>]\n"
+"           <lệnh> [<các tham số>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14458,20 +14865,67 @@ msgstr ""
 "hướng dẫn v� khái niệm. Xem “git help <lệnh>� hay “git help <khái-niệm>�\n"
 "để xem các đặc tả cho lệnh hay khái niệm cụ thể."
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "chưa chỉ ra thư mục cho --git-dir\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "chưa đưa ra cây làm việc cho --work-tree\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "chưa đưa ra ti�n tố cho --super-prefix\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c cần một chuỗi cấu hình\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+"chưa đưa ra thư mục cho -C\n"
+"\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "không hiểu tùy ch�n: %s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "gặp lỗi khi khai triển bí danh “%s�; “%s� không phải là lệnh git\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "gặp lỗi khi chạy lệnh “%s�: %s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "giá trị âm cho http.postbuffer; mặc định là %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "�i�u khiển giao quy�n không được hỗ trợ với cURL < 7.22.0"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14482,16 +14936,16 @@ msgstr ""
 "      h�i cho: %s\n"
 " chuyển hướng: %s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "chuyển hướng đến %s"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "các_tham_số"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "l�c đối tượng"
 
@@ -14601,23 +15055,23 @@ msgstr "Hiển thị trạng thái cây làm việc"
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "ngày hết hạn"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "no-op (tương thích ngược)"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "chi tiết hơn nữa"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "im lặng hơn nữa"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
 
@@ -14850,7 +15304,7 @@ msgstr "�ang thử hòa trộn đơn giản với $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -14865,44 +15319,44 @@ msgstr ""
 "�ể bãi b� và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
 "--abort\"."
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Không thể quay trở lại $head_name"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "�ã áp dụng autostash."
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Không thể lưu $stash_sha1"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Móc (hook) pre-rebase từ chối rebase."
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 "Hình như đang trong quá trình thực hiện lệnh “git-am�. Không thể rebase."
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Hành động “--edit-todo� chỉ có thể dùng trong quá trình “rebase� (sửa lịch "
 "sử) tương tác."
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "Không thể đ�c HEAD"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14910,7 +15364,7 @@ msgstr ""
 "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
 "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14931,74 +15385,74 @@ msgstr ""
 "và chạy TÔI lần nữa. TÔI  dừng lại trong trư�ng hợp bạn vẫn\n"
 "có một số thứ quý giá ở đây."
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "thượng nguồn không hợp lệ “$upstream_name�"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: ở đây có nhi�u hơn một n�n móng hòa trộn"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: ở đây không có n�n móng hòa trộn nào"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "nghiêm tr�ng: không có nhánh như thế: “$branch_name�"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "Không thể autostash"
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�ã tạo autostash: $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD đã cập nhật."
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Thay đổi từ $mb thành $onto:"
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
@@ -15067,86 +15521,86 @@ msgstr "Không thể ghi lại trạng thái hiện hành"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "�ã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "Không thể gỡ b� các thay đổi cây-làm-việc"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "không hiểu tùy ch�n: $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "Không tìm thấy các mục tạm cất (stash) nào."
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Chỉ ra quá nhi�u điểm xét duyệt: $REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference không phải là tham chiếu hợp lệ"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "“$args� không phải là lần chuyển giao kiểu-stash (cất đi)"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "�$args� không phải tham chiếu đến stash"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "không thể làm tươi mới bảng mục lục"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy ch�n --index."
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "Không thể ghi lại cây chỉ mục"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "Không thể b� ra kh�i bệ phóng các tập tin đã được sửa chữa"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "Bảng mục lục đã không được b� stash."
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr "Các mục tạm cất (stash) được giữ trong trư�ng hợp bạn lại cần nó."
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "�ã xóa ${REV} ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Không thể xóa b� mục stash"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "Chưa chỉ ra tên của nhánh"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(�ể phục hồi lại chúng hãy gõ \"git stash apply\")"
 
@@ -15249,68 +15703,19 @@ msgstr "�ang vào “$displaypath�"
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "Dừng lại tại “$displaypath�; script trả v� trạng thái khác không."
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "đặc tả đư�ng dẫn và --all xung khắc nhau"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Dùng “--all� nếu bạn thực sự muốn hủy khởi tạo m�i mô-đun-con"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"Cây làm việc mô-đun-con “$displaypath� có chứa thư mục .git\n"
-"(dùng “rm -rf� nếu bạn thực sự muốn gỡ b� nó cùng với tất cả lịch sử của "
-"chúng)"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-"Cây làm việc mô-đun-con “$displaypath� chứa các thay đổi nội bộ; hãy dùng “-"
-"f� để loại b� chúng đi"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "�ã tạo thư mục “$displaypath�"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "Không thể gỡ b� cây làm việc mô-đun-con “$displaypath�"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath�"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr "Mô-đun-con “$name� ($url) được b� đăng ký cho đư�ng dẫn “$displaypath�"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Không tìm thấy điểm xét duyệt hiện hành trong đư�ng dẫn mô-đun-con "
 "“$displaypath�"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Không thể lấy v� trong đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15319,12 +15724,12 @@ msgstr ""
 "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
 "đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Không thể lấy v� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15333,85 +15738,80 @@ msgstr ""
 "�ã lấy v� từ đư�ng dẫn mô-đun con “$displaypath�, nhưng nó không chứa $sha1. "
 "Lấy v� theo định hướng của lần chuyển giao đó gặp lỗi."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Không thể lấy ra “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: đã checkout “$sha1�"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Không thể cải tổ “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: được rebase vào trong “$sha1�"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Không thể hòa trộn (merge) “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: được hòa trộn vào “$sha1�"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Thực hiện không thành công lệnh “$command $sha1� trong đư�ng dẫn mô-đun-con "
 "“$displaypath�"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: “$command $sha1�"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Tùy ch�n --cached không thể dùng cùng với tùy ch�n --files"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "chế độ không như mong ch� $mod_dst"
 
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
 
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
 
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
 "$sha1_dst"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath�"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15467,7 +15867,7 @@ msgstr ""
 "\n"
 "Nếu bạn xóa b� một dòng ở đây thì LẦN CHUYỂN GIAO �Ó SẼ MẤT.\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15486,82 +15886,82 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Chuyển-tiếp-nhanh đến $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Không thể di chuyển HEAD đến $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Từ chối squash lần hòa trộn: $sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Không thể lấy ra $sha1"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "�ây là chú thích cho lần chuyển giao thứ #${n}:"
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị b� qua:"
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "�ây là tổ hợp của $count lần chuyển giao."
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Không thể $fixup_msg"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "�ây là tổ hợp của 2 lần chuyển giao."
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Không thể áp dụng $sha1… $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15577,31 +15977,31 @@ msgstr ""
 "này\n"
 "trước khi bạn có thể làm việc lại với lần chuyển giao."
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Bị dừng tại $sha1_abbrev… $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Không “$squash_style� thể mà không có lần chuyển giao kế trước"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Thá»±c thi: $rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Thực thi gặp lỗi: $rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
 
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15612,7 +16012,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15627,29 +16027,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Lệnh chưa biết: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo�."
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Cài tổ và cập nhật $head_name một cách thành công."
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "không thể tách r�i HEAD"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Không thể xóa b� CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15680,11 +16080,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15693,11 +16093,11 @@ msgstr ""
 "Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue� lần "
 "nữa."
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15711,43 +16111,43 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "Không thể thực thi trình biên soạn"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Không thể checkout $switch_to"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "Không HEAD?"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Không thể tạo thư mục tạm th�i $state_dir"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "Không thể đánh dấu là tương tác"
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "Không thể tạo danh sách cần làm"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15756,7 +16156,7 @@ msgstr ""
 "\n"
 "Tuy nhiên, nếu bạn xóa b� m�i thứ, việc cải tổ sẽ bị bãi b�.\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
 
@@ -15897,7 +16297,7 @@ msgstr "Thêm các cái chưa được theo dõi"
 msgid "No untracked files.\n"
 msgstr "Không có tập tin nào chưa được theo dõi.\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15905,7 +16305,7 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để chuyển lên bệ phóng."
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15913,7 +16313,7 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để tạm cất."
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15921,7 +16321,7 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để b� chuyển lên bệ phóng."
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15929,7 +16329,7 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để áp dụng."
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15937,16 +16337,16 @@ msgstr ""
 "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
 "được đánh dấu để loại b�."
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "gặp lỗi khi tập tin sửa hunk để ghi: %s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Chế độ sửa hunk bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -15960,7 +16360,7 @@ msgstr ""
 "Những dòng bắt đầu bằng %s sẽ bị loại b�.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15970,7 +16370,7 @@ msgstr ""
 "để sửa lần nữa. Nếu m�i dòng của hunk bị xóa b�, thế thì những\n"
 "sửa dổi sẽ bị loại b�, và hunk vẫn giữ nguyên.\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "gặp lỗi khi mở tập tin hunk để đ�c: %s"
@@ -15981,14 +16381,14 @@ msgstr "gặp lỗi khi mở tập tin hunk để đ�c: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
 "b�!) [y/n]? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -16003,7 +16403,7 @@ msgstr ""
 "d - đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong tập "
 "tin"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -16017,7 +16417,7 @@ msgstr ""
 "a - tạm cất hunk này và tất cả các hunk sau này trong tập tin\n"
 "d - đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại trong tập tin"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -16033,7 +16433,7 @@ msgstr ""
 "d - đừng đưa ra kh�i bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong "
 "tập tin"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -16047,7 +16447,7 @@ msgstr ""
 "a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
 "d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -16061,7 +16461,7 @@ msgstr ""
 "a - loại b� hunk này và tất cả các hunk sau này trong tập tin\n"
 "d - đừng loại b� hunk này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16075,7 +16475,7 @@ msgstr ""
 "a - loại b� hunk này và tất cả các hunk sau này trong tập tin\n"
 "d - đừng loại b� hunk này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16089,7 +16489,7 @@ msgstr ""
 "a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
 "d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16111,194 +16511,209 @@ msgstr ""
 "e - sửa bằng tay hunk hiện hành\n"
 "? - in trợ giúp\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Các hunk đã ch�n không được áp dụng vào bảng mục lục!\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "Vẫn áp dụng chúng cho cây làm việc? "
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "�ã không áp dụng gì cả.\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "b� qua những thứ chưa hòa trộn: %s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "Không có thay đổi nào.\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "Cập nhật miếng vá"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Xóa kh�i bệ phóng [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Xóa kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "�ưa lên bệ phóng hunk này [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "�ưa lên bệ phóng hunk này [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Xóa tạm cất [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Tạm cất hunk này [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Tạm cất hunk này [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Thay đổi chế độ b� ra kh�i bệ phóng [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Thay đổi chế độ b� ra kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Xóa b� việc b� ra kh�i bệ phóng [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Xóa b� việc b� ra kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "B� ra kh�i bệ phóng hunk này [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "B� ra kh�i bệ phóng hunk này [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "�p dụng thay đổi chế độ cho mục lục [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "�p dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "�p dụng việc xóa vào mục lục [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "�p dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "�o dụng hunk này vào mục lục [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "�o dụng hunk này vào mục lục [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Loại b� các thay đổi chế độ từ cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Loại b� các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Loại b� việc xóa kh�i cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Loại b� việc xóa kh�i cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Loại b� hunk này kh�i cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Loại b� hunk này kh�i cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Loại b� thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Loại b� thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Loại b� việc xóa kh�i mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Loại b� việc xóa kh�i mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Loại b� hunk này kh�i mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Loại b� hunk này kh�i mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"�p dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "�p dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "�p dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "�p dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "�p dụng hunk này vào mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "�p dụng hunk này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "Không còn hunk nào để mà nhảy đến\n"
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "nhảy đến hunk nào (<ret> để xem thêm)? "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "nhảy đến hunk nào?"
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Số không hợp lệ: “%s�\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Rất tiếc, chỉ có sẵn %d hunk..\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "Không còn hunk nào để mà tìm kiếm\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "tìm kiếm cho regex? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "�ịnh dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "Không thấy hunk nào khớp mẫu đã cho\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "Không có hunk kế trước\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "Không có hunk kế tiếp\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Rất tiếc, không thể chia nh� hunk này\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Chi nh� thành %d hunks.\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Rất tiếc, không thể sửa hunk này\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "Xem xét lại diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16318,84 +16733,92 @@ msgstr ""
 "add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
 "thay đổi đã đặt lên bệ phóng\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "thiếu --"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "không hiểu chế độ --patch: %s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "đối số không hợp lệ %s, cần --"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "múi gi� nội bộ khác biệt với GMT bởi khoảng th�i gian không-phút\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "khoảng bù th�i gian nội bộ lớn hơn hoặc bằng 24 gi�\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "trình soạn thảo thoát không sạch sẽ, bãi b� m�i thứ"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "“%s� có chưa một phiên bản trung gian của thư bạn đã soạn.\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "“%s.final� chứa thư điện tử đã soạn thảo.\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases xung khắc với các tùy ch�n khác\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"“batch-size� và “relogin� phải được chỉ định cùng với nhau (thông qua dòng "
+"lệnh hoặc tùy ch�n cấu hình)\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Không hiểu trư�ng --suppress-cc: “%s�\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Không hiểu cài đặt --confirm: “%s�\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16410,12 +16833,12 @@ msgstr ""
 "    * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n"
 "    * �ưa ra tùy ch�n --format-patch nếu ý bạn là chuẩn bị.\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gặp lỗi khi mở thư mục “%s�: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16424,7 +16847,7 @@ msgstr ""
 "nghiêm tr�ng: %s: %s\n"
 "cảnh báo: không có miếng vá nào được gửi đi\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16434,17 +16857,17 @@ msgstr ""
 "Chưa chỉ định các tập tin miếng vá!\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Không có dòng chủ đ� trong %s?"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gặp lỗi khi mở “%s� để ghi: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16458,31 +16881,27 @@ msgstr ""
 "\n"
 "Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Gặp lỗi khi mở %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gặp lỗi khi mở “%s�: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "Các trư�ng To/Cc/Bcc không được phiên dịch, chúng bị b� qua\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Gặp lỗi khi mở %s.final: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "Thư tổng thể là trống rỗng, nên b� qua nó\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Bạn có chắc muốn dùng <%s> [y/N]? "
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16490,11 +16909,11 @@ msgstr ""
 "Các trư�ng sau đây là 8bit, nhưng không khai báo một Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? "
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16507,20 +16926,20 @@ msgstr ""
 "có chủ đ� ở dạng mẫu “*** SUBJECT HERE ***�. Dùng --force nếu bạn thực sự "
 "muốn gửi.\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Tới ngư�i mà thư được gửi (nếu có)?"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "nghiêm tr�ng: bí danh “%s� được khai triển thành chính nó\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? "
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n"
@@ -16528,16 +16947,16 @@ msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): "
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "đư�ng dẫn CA “%s� không tồn tại"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16564,134 +16983,153 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Gửi thư này chứ? ([y]có|[n]không|[q]thoát|[a]tất): "
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "Gửi thư này trả l�i yêu cầu"
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp."
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gặp lỗi! %s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-"
 "debug."
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gặp lỗi khi gửi %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Thá»­ gá»­i %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Gá»­i %s\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "Kết quả: "
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "Kết quả: Tốt\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "không thể mở tập tin “%s�"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Thêm cc: %s từ dòng “%s�\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) �ang thêm to: %s từ dòng “%s�\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Thêm cc: %s từ dòng “%s�\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Thêm cc: %s từ dòng “%s�\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Không thể thực thi “%s�"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) �ang thêm %s: %s từ: “%s�\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) gặp lỗi khi đóng đư�ng ống đến “%s�"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "không thể lấy gửi thư dạng 7 bít"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "bảng mã truy�n không hợp lệ"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "không thể mở %s: %s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "B� qua %s với hậu tố sao lưu dự phòng “%s�.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
 
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "biểu thức đặc tả bộ l�c “%s� không hợp lệ"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "đặc tả đư�ng dẫn và --all xung khắc nhau"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr ""
+#~ "Mô-đun-con “$name� ($url) được b� đăng ký cho đư�ng dẫn “$displaypath�"
+
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr "Các trư�ng To/Cc/Bcc không được phiên dịch, chúng bị b� qua\n"
+
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
 #~ "please use . instead if you meant to match all paths"
@@ -17123,9 +17561,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
 #~ msgid "Unprocessed path??? %s"
 #~ msgstr "�ư�ng dẫn chưa được xử lý??? %s"
 
-#~ msgid "Error wrapping up %s"
-#~ msgstr "Lỗi bao b�c %s"
-
 #~ msgid "Cannot %s during a %s"
 #~ msgstr "Không thể %s trong khi %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c3c2408..fa3f484 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@
 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
 # This file is distributed under the same license as the Git package.
 # Contributors:
-#	- Fangyi Zhou <fangyi.zhou AT yuriko.moe>
+#   - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
 #   - Jiang Xin <worldhello.net AT gmail.com>
 #   - Lian Cheng <rhythm.mail AT gmail.com>
 #   - Ray Chen <oldsharp AT gmail.com>
@@ -138,8 +138,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-01-07 07:50+0800\n"
-"PO-Revision-Date: 2018-01-09 09:53+0800\n"
+"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"PO-Revision-Date: 2018-03-25 22:20+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲�而退出。"
 
-#: advice.c:121 builtin/merge.c:1213
+#: advice.c:121 builtin/merge.c:1251
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结�您的�并（存在 MERGE_HEAD）。"
 
@@ -576,14 +576,14 @@ msgstr "�模组 %s 的 sha1 信�缺失或无效"
 #: apply.c:4087
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
-msgstr "%s 的模�被改�，但它�在当� HEAD 中"
+msgstr "%s 的模��更，但它�在当� HEAD 中"
 
 #: apply.c:4090
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信�缺失或无效（%s）。"
 
-#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry �作失败"
@@ -659,7 +659,7 @@ msgstr[1] "应用 %%s 个补�，其中 %d 个被拒�..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件�为 %.*s.rej"
 
-#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
 #, c-format
 msgid "cannot open %s"
 msgstr "�能打开 %s"
@@ -717,11 +717,11 @@ msgstr[1] "修�空白错误�，应用了 %d 行。"
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
-#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
-#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
-#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
+#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "路径"
@@ -734,7 +734,7 @@ msgstr "��应用与给出路径�匹�的�更"
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径�匹�的�更"
 
-#: apply.c:4927 builtin/am.c:2229
+#: apply.c:4927 builtin/am.c:2263
 msgid "num"
 msgstr "æ•°å­—"
 
@@ -774,75 +774,75 @@ msgstr "应用补�而�修改工作区"
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作区之外文件的补�"
 
-#: apply.c:4949
+#: apply.c:4950
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补�（与 --stat/--summary/--check 选项�时使用）"
 
-#: apply.c:4951
+#: apply.c:4952
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "如果一个补��能应用则�试三方�并"
 
-#: apply.c:4953
+#: apply.c:4954
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信�"
 
-#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:4958
+#: apply.c:4959
 msgid "ensure at least <n> lines of context match"
 msgstr "确�至少匹� <n> 行上下文"
 
-#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3009
+#: builtin/pack-objects.c:3035
 msgid "action"
 msgstr "动作"
 
-#: apply.c:4960
+#: apply.c:4961
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4964 apply.c:4967
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的�更"
 
-#: apply.c:4969
+#: apply.c:4970
 msgid "apply the patch in reverse"
 msgstr "��应用补�"
 
-#: apply.c:4971
+#: apply.c:4972
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:4973
+#: apply.c:4974
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒�的补�片段�存在对应的 *.rej 文件中"
 
-#: apply.c:4975
+#: apply.c:4976
 msgid "allow overlapping hunks"
 msgstr "�许��的补�片段"
 
-#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
-#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
+#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "冗长输出"
 
-#: apply.c:4978
+#: apply.c:4979
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�许�正确的文件末尾�行符"
 
-#: apply.c:4981
+#: apply.c:4982
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任补�片段的头信�中的行�"
 
-#: apply.c:4983 builtin/am.c:2217
+#: apply.c:4984 builtin/am.c:2251
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:4984
+#: apply.c:4985
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件��添加 <根目录>"
 
@@ -877,7 +877,7 @@ msgstr "格�"
 msgid "archive format"
 msgstr "归档格�"
 
-#: archive.c:437 builtin/log.c:1459
+#: archive.c:437 builtin/log.c:1462
 msgid "prefix"
 msgstr "�缀"
 
@@ -885,11 +885,11 @@ msgstr "�缀"
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中�个路径�加上�缀"
 
-#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
-#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
-#: parse-options.h:153
+#: parse-options.h:165
 msgid "file"
 msgstr "文件"
 
@@ -921,8 +921,8 @@ msgstr "压缩效果更好"
 msgid "list supported archive formats"
 msgstr "列出支�的归档格�"
 
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
-#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
+#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
 msgid "repo"
 msgstr "仓库"
 
@@ -973,22 +973,22 @@ msgstr ""
 "负值模版在 git attributes 中被忽略\n"
 "当字符串确实�以感��开始时，使用 '\\!'。"
 
-#: bisect.c:458
+#: bisect.c:460
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "文件 '%s' 包�错误的引用格�：%s"
 
-#: bisect.c:666
+#: bisect.c:668
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找�\n"
 
-#: bisect.c:720
+#: bisect.c:722
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�是一个有效的�交� %s"
 
-#: bisect.c:744
+#: bisect.c:746
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -997,7 +997,7 @@ msgstr ""
 "�并基线 %s 是�的。\n"
 "这�味�介于 %s 和 [%s] 之间的 bug 已�被修�。\n"
 
-#: bisect.c:749
+#: bisect.c:751
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1006,7 +1006,7 @@ msgstr ""
 "�并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已�被修改。\n"
 
-#: bisect.c:754
+#: bisect.c:756
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1015,7 +1015,7 @@ msgstr ""
 "�并基线 %s 是 %s。\n"
 "这�味�第一个 '%s' �交�于 %s 和 [%s] 之间。\n"
 
-#: bisect.c:762
+#: bisect.c:764
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1026,7 +1026,7 @@ msgstr ""
 "这�情况下 git 二分查找无法正常工作。\n"
 "您�能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c:775
+#: bisect.c:777
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1042,31 +1042,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：�并基线必须是�过测试的\n"
 
-#: bisect.c:862
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需�一个 %s 版本"
 
-#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
 #, c-format
 msgid "could not create file '%s'"
 msgstr "�能创建文件 '%s'"
 
-#: bisect.c:930
+#: bisect.c:920
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能读�文件 '%s'"
 
-#: bisect.c:960
+#: bisect.c:950
 msgid "reading bisect refs failed"
 msgstr "读�二分查找引用失败"
 
-#: bisect.c:979
+#: bisect.c:969
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s �时为 %s 和 %s\n"
 
-#: bisect.c:987
+#: bisect.c:977
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1075,7 +1075,7 @@ msgstr ""
 "没有�现�测试的�交。\n"
 "�能您在�行时使用了错误的路径�数？\n"
 
-#: bisect.c:1006
+#: bisect.c:996
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1085,43 +1085,43 @@ msgstr[1] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1012
+#: bisect.c:1002
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "二分查找中：在此之�，还剩 %d 个版本待测试 %s\n"
 msgstr[1] "二分查找中：在此之�，还剩 %d 个版本待测试 %s\n"
 
-#: blame.c:1757
+#: blame.c:1758
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents 和 --reverse �能混用。"
 
-#: blame.c:1768
+#: blame.c:1769
 msgid "cannot use --contents with final commit object name"
 msgstr "�能将 --contents 和最终的�交对象�共用"
 
-#: blame.c:1788
+#: blame.c:1789
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
-#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
-#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
+#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 msgstr "版本�历设置失败"
 
-#: blame.c:1815
+#: blame.c:1816
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse 和 --first-parent 共用，需�第一祖先链上的�交范围"
 
-#: blame.c:1826
+#: blame.c:1827
 #, c-format
 msgid "no such path %s in %s"
 msgstr "在 %2$s 中无此路径 %1$s"
 
-#: blame.c:1837
+#: blame.c:1838
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "�能为路径 %2$s 读�数�对象 %1$s"
@@ -1269,76 +1269,75 @@ msgstr "'%s' ��是一个 v2 版本的包文件"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
-#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
 #, c-format
 msgid "could not open '%s'"
 msgstr "�能打开 '%s'"
 
-#: bundle.c:140
+#: bundle.c:139
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的�交："
 
-#: bundle.c:193
+#: bundle.c:190
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "这个包中�有这个引用："
 msgstr[1] "这个包中�有 %d 个引用："
 
-#: bundle.c:200
+#: bundle.c:197
 msgid "The bundle records a complete history."
 msgstr "这个包记录一个完整历�。"
 
-#: bundle.c:202
+#: bundle.c:199
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "这个包需�这个引用："
 msgstr[1] "这个包需� %d 个引用："
 
-#: bundle.c:261
+#: bundle.c:258
 msgid "Could not spawn pack-objects"
 msgstr "�能生� pack-objects 进程"
 
-#: bundle.c:272
+#: bundle.c:269
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c:314
+#: bundle.c:311
 msgid "rev-list died"
 msgstr "rev-list 终止"
 
-#: bundle.c:363
+#: bundle.c:360
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的�数：%s"
 
-#: bundle.c:461
+#: bundle.c:458
 msgid "Refusing to create empty bundle."
 msgstr "�能创建空包。"
 
-#: bundle.c:473
+#: bundle.c:470
 #, c-format
 msgid "cannot create '%s'"
 msgstr "�能创建 '%s'"
 
-#: bundle.c:501
+#: bundle.c:498
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: color.c:301
+#: color.c:296
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
 
-#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1434 builtin/am.c:2069
+#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072
 #, c-format
 msgid "could not parse %s"
 msgstr "�能解� %s"
@@ -1346,9 +1345,9 @@ msgstr "�能解� %s"
 #: commit.c:43
 #, c-format
 msgid "%s %s is not a commit!"
-msgstr "%s %s �是一个�交!"
+msgstr "%s %s �是一个�交�"
 
-#: commit.c:1524
+#: commit.c:1506
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1454,65 +1453,65 @@ msgstr "'%2$s' 的值 '%1$s' �是一个有效的时间戳"
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:1222
+#: config.c:1225
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模�：%s"
 
-#: config.c:1378
+#: config.c:1386
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1574
+#: config.c:1582
 msgid "unable to parse command-line config"
 msgstr "无法解�命令行中的�置"
 
-#: config.c:1906
+#: config.c:1914
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读��置文件时�到未知错误"
 
-#: config.c:2093
+#: config.c:2101
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:2136
+#: config.c:2144
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "未知的 core.untrackedCache �值 '%s'，使用默认值 'keep'"
 
-#: config.c:2162
+#: config.c:2170
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2187
+#: config.c:2195
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解�命令行�置中的 '%s'"
 
-#: config.c:2189
+#: config.c:2197
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行�现错误的�置�� '%1$s'"
 
-#: config.c:2248
+#: config.c:2256
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个�值"
 
-#: config.c:2591 config.c:2808
+#: config.c:2599 config.c:2816
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:2698
+#: config.c:2706
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能设置 '%s' 为 '%s'"
 
-#: config.c:2700 builtin/remote.c:776
+#: config.c:2708 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "�能�消设置 '%s'"
@@ -1532,24 +1531,29 @@ msgstr ""
 "\n"
 "请确认您有正确的访问��并且仓库存在。"
 
-#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
 msgid "Checking connectivity"
 msgstr "检查连接中"
 
-#: connected.c:76
+#: connected.c:78
 msgid "Could not run 'git rev-list'"
 msgstr "�能执行 'git rev-list'"
 
-#: connected.c:96
+#: connected.c:98
 msgid "failed write to rev-list"
 msgstr "无法写入 rev-list"
 
-#: connected.c:103
+#: connected.c:105
 msgid "failed to close rev-list's stdin"
 msgstr "无法关闭 rev-list 的标准输入"
 
 #: convert.c:205
 #, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "文件 %s 中的 CRLF 将被 LF 替�。"
+
+#: convert.c:207
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
@@ -1557,12 +1561,12 @@ msgstr ""
 "文件 %s 中的 CRLF 将被 LF 替�。\n"
 "在工作区中该文件���原有的�行符。"
 
-#: convert.c:209
+#: convert.c:215
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "文件 %s 中的 CRLF 将被 LF 替�。"
+msgid "LF would be replaced by CRLF in %s"
+msgstr "文件 %s 中的 LF 将被 CRLF 替�"
 
-#: convert.c:215
+#: convert.c:217
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1571,11 +1575,6 @@ msgstr ""
 "文件 %s 中的 LF 将被 CRLF 替�。\n"
 "在工作区中该文件���原有的�行符。"
 
-#: convert.c:219
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "文件 %s 中的 LF 将被 CRLF 替�"
-
 #: date.c:116
 msgid "in the future"
 msgstr "在将�"
@@ -1691,20 +1690,24 @@ msgstr ""
 "�现�置�� 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:3799
+#: diff.c:3822
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，�止在 %s"
 
-#: diff.c:4127
+#: diff.c:4146
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
 
-#: diff.c:4215
+#: diff.c:4149
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G�-S 和 --find-object 是互斥的"
+
+#: diff.c:4237
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确�求�跟一个路径规格"
 
-#: diff.c:4381
+#: diff.c:4403
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1713,39 +1716,44 @@ msgstr ""
 "无法解� --dirstat/-X 选项的�数：\n"
 "%s"
 
-#: diff.c:4395
+#: diff.c:4417
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "无法解� --submodule 选项的�数：'%s'"
 
-#: diff.c:5446
+#: diff.c:5493
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "因为文件太多，略过�严格的�命�检查。"
 
-#: diff.c:5449
+#: diff.c:5496
 msgid "only found copies from modified paths due to too many files."
 msgstr "因为文件太多，�在修改的路径中查找拷�。"
 
-#: diff.c:5452
+#: diff.c:5499
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "您�能想�将�� %s 设置为至少 %d 并�次执行此命令。"
 
-#: dir.c:2100
+#: dir.c:1866
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "�能打开目录 '%s'"
+
+#: dir.c:2108
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核�称和信�"
 
-#: dir.c:2219
+#: dir.c:2232
 msgid "Untracked cache is disabled on this system or location."
 msgstr "缓存未跟踪文件在本系统或�置中被�用。"
 
-#: dir.c:3002 dir.c:3007
+#: dir.c:3024 dir.c:3029
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能为 %s 创建目录"
 
-#: dir.c:3032
+#: dir.c:3054
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能从 '%s' �移 git 目录到 '%s'"
@@ -1764,184 +1772,192 @@ msgstr "过滤内容"
 msgid "could not stat file '%s'"
 msgstr "�能对文件 '%s' 调用 stat"
 
-#: fetch-pack.c:252
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "远程未设置 URL"
+
+#: fetch-pack.c:253
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:264
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack：应为 ACK/NAK，�得到 EOF"
+#: fetch-pack.c:265
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack：期望 ACK/NAK，�得到 flush 包"
 
-#: fetch-pack.c:283 builtin/archive.c:63
+#: fetch-pack.c:284 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
 
-#: fetch-pack.c:284
+#: fetch-pack.c:285
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，�得到 '%s'"
 
-#: fetch-pack.c:336
+#: fetch-pack.c:337
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需� multi_ack_detailed"
 
-#: fetch-pack.c:422
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信�：%s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:434
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信�：%s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:436
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:433
+#: fetch-pack.c:439
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:441
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未�现 shallow：%s"
 
-#: fetch-pack.c:438
+#: fetch-pack.c:444
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:477
+#: fetch-pack.c:485
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:491
+#: fetch-pack.c:499
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效�交 %s"
 
-#: fetch-pack.c:524
+#: fetch-pack.c:532
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:534 progress.c:229
+#: fetch-pack.c:542 progress.c:229
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:546
+#: fetch-pack.c:554
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:592
+#: fetch-pack.c:600
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完�"
 
-#: fetch-pack.c:777
+#: fetch-pack.c:788
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已�有 %s（%s）"
 
-#: fetch-pack.c:815
+#: fetch-pack.c:829
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:823
+#: fetch-pack.c:837
 msgid "protocol error: bad pack header"
 msgstr "�议错误：�的包头"
 
-#: fetch-pack.c:879
+#: fetch-pack.c:895
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:911
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:913
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:924
+#: fetch-pack.c:940
 msgid "Server does not support shallow clients"
 msgstr "�务器�支� shalllow 客户端"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:944
 msgid "Server supports multi_ack_detailed"
 msgstr "�务器支� multi_ack_detailed"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:947
 msgid "Server supports no-done"
 msgstr "�务器支� no-done"
 
-#: fetch-pack.c:937
+#: fetch-pack.c:953
 msgid "Server supports multi_ack"
 msgstr "�务器支� multi_ack"
 
-#: fetch-pack.c:941
+#: fetch-pack.c:957
 msgid "Server supports side-band-64k"
 msgstr "�务器支� side-band-64k"
 
-#: fetch-pack.c:945
+#: fetch-pack.c:961
 msgid "Server supports side-band"
 msgstr "�务器支� side-band"
 
-#: fetch-pack.c:949
+#: fetch-pack.c:965
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "�务器支� allow-tip-sha1-in-want"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:969
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "�务器支� allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:963
+#: fetch-pack.c:979
 msgid "Server supports ofs-delta"
 msgstr "�务器支� ofs-delta"
 
-#: fetch-pack.c:970
+#: fetch-pack.c:985
+msgid "Server supports filter"
+msgstr "�务器支� filter"
+
+#: fetch-pack.c:993
 #, c-format
 msgid "Server version is %.*s"
 msgstr "�务器版本 %.*s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:999
 msgid "Server does not support --shallow-since"
 msgstr "�务器�支� --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1003
 msgid "Server does not support --shallow-exclude"
 msgstr "�务器�支� --shallow-exclude"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1005
 msgid "Server does not support --deepen"
 msgstr "�务器�支� --deepen"
 
-#: fetch-pack.c:993
+#: fetch-pack.c:1016
 msgid "no common commits"
 msgstr "没有共�的�交"
 
-#: fetch-pack.c:1005
+#: fetch-pack.c:1028
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获�失败。"
 
-#: fetch-pack.c:1167
+#: fetch-pack.c:1190
 msgid "no matching remote head"
 msgstr "没有匹�的远程分支"
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1212
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:1192
+#: fetch-pack.c:1215
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "�务器��许请求未公开的对象 %s"
@@ -1964,17 +1980,18 @@ msgstr "无法将分离�签�写入 '%s'"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
-#: grep.c:2017
+#: grep.c:2022
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读� %s"
 
-#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "对 '%s' 调用 stat 失败"
 
-#: grep.c:2045
+#: grep.c:2050
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读��完整"
@@ -2115,19 +2132,18 @@ msgstr "��许空的姓�（对于 <%s>）"
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓�中仅包��用字符：%s"
 
-#: ident.c:416 builtin/commit.c:616
+#: ident.c:416 builtin/commit.c:582
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格�：%s"
 
-#: list-objects-filter-options.c:30
-msgid "multiple object filter types cannot be combined"
-msgstr "�能混用多�对象过滤类型"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "�能混用多�过滤规格"
 
-#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
-#, c-format
-msgid "invalid filter-spec expression '%s'"
-msgstr "无效的 filter-spec 表达� '%s'"
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr "无法修改部分克隆的 promisor 远程仓库"
 
 #: lockfile.c:151
 #, c-format
@@ -2156,8 +2172,8 @@ msgstr "�能创建 '%s.lock'：%s"
 msgid "failed to read the cache"
 msgstr "无法读�缓存"
 
-#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
-#: builtin/checkout.c:600 builtin/clone.c:754
+#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:599 builtin/clone.c:759
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
 
@@ -2174,60 +2190,60 @@ msgstr "为路径 '%s' addinfo_cache 失败"
 msgid "error building trees"
 msgstr "无法创建树"
 
-#: merge-recursive.c:752
+#: merge-recursive.c:771
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "无法创建路径 '%s'%s"
 
-#: merge-recursive.c:763
+#: merge-recursive.c:782
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为�目录留出空间\n"
 
-#: merge-recursive.c:777 merge-recursive.c:796
+#: merge-recursive.c:796 merge-recursive.c:815
 msgid ": perhaps a D/F conflict?"
 msgstr "：�能是一个目录/文件冲�？"
 
-#: merge-recursive.c:786
+#: merge-recursive.c:805
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒�丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c:828 builtin/cat-file.c:37
+#: merge-recursive.c:847 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "�能读�对象 %s '%s'"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:849
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数�对象"
 
-#: merge-recursive.c:854
+#: merge-recursive.c:873
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "无法打开 '%s'：%s"
 
-#: merge-recursive.c:865
+#: merge-recursive.c:884
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "无法创建符�链接 '%s'：%s"
 
-#: merge-recursive.c:870
+#: merge-recursive.c:889
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "�知�如何处� %06o %s '%s'"
 
-#: merge-recursive.c:1010
+#: merge-recursive.c:1029
 msgid "Failed to execute internal merge"
 msgstr "无法执行内部�并"
 
-#: merge-recursive.c:1014
+#: merge-recursive.c:1034
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "�能添加 %s 至对象库"
 
-#: merge-recursive.c:1117
+#: merge-recursive.c:1146
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2236,7 +2252,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被�留。"
 
-#: merge-recursive.c:1122
+#: merge-recursive.c:1151
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2245,7 +2261,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被�留。"
 
-#: merge-recursive.c:1129
+#: merge-recursive.c:1158
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2254,7 +2270,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本�留在 %8$s 中。"
 
-#: merge-recursive.c:1134
+#: merge-recursive.c:1163
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2263,20 +2279,20 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本�留在 %9$s 中。"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "rename"
 msgstr "�命�"
 
-#: merge-recursive.c:1168
+#: merge-recursive.c:1197
 msgid "renamed"
 msgstr "�命�"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1254
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为�被添加"
 
-#: merge-recursive.c:1250
+#: merge-recursive.c:1279
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2285,140 +2301,140 @@ msgstr ""
 "冲�（�命�/�命�）：在分支 \"%3$s\" 中�命� \"%1$s\"->\"%2$s\"，在分支 "
 "\"%6$s\" 中�命� \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1284
 msgid " (left unresolved)"
 msgstr "（留下未解决）"
 
-#: merge-recursive.c:1317
+#: merge-recursive.c:1346
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "冲�（�命�/�命�）：在 %3$s 中�命� %1$s->%2$s，在 %6$s 中�命� %4$s->"
 "%5$s"
 
-#: merge-recursive.c:1350
+#: merge-recursive.c:1379
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "而是�命� %s 至 %s，以� %s 至 %s"
 
-#: merge-recursive.c:1553
+#: merge-recursive.c:1582
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "冲�（�命�/添加）：在 %3$s 中�命� %1$s->%2$s。在 %5$s 中添加 %4$s"
 
-#: merge-recursive.c:1568
+#: merge-recursive.c:1597
 #, c-format
 msgid "Adding merged %s"
 msgstr "添加�并�的 %s"
 
-#: merge-recursive.c:1575 merge-recursive.c:1805
+#: merge-recursive.c:1604 merge-recursive.c:1834
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为�添加"
 
-#: merge-recursive.c:1632
+#: merge-recursive.c:1661
 #, c-format
 msgid "cannot read object %s"
 msgstr "�能读�对象 %s"
 
-#: merge-recursive.c:1635
+#: merge-recursive.c:1664
 #, c-format
 msgid "object %s is not a blob"
 msgstr "对象 %s �是一个数�对象"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:1704
+#: merge-recursive.c:1733
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1743
 msgid "content"
 msgstr "内容"
 
-#: merge-recursive.c:1721
+#: merge-recursive.c:1750
 msgid "add/add"
 msgstr "添加/添加"
 
-#: merge-recursive.c:1757
+#: merge-recursive.c:1786
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已��过相��并）"
 
-#: merge-recursive.c:1771
+#: merge-recursive.c:1800
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自动�并 %s"
 
-#: merge-recursive.c:1775 git-submodule.sh:932
+#: merge-recursive.c:1804 git-submodule.sh:879
 msgid "submodule"
 msgstr "�模组"
 
-#: merge-recursive.c:1776
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲�（%s）：�并冲�于 %s"
 
-#: merge-recursive.c:1870
+#: merge-recursive.c:1899
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c:1896
+#: merge-recursive.c:1925
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c:1902
+#: merge-recursive.c:1931
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c:1909
+#: merge-recursive.c:1938
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "冲�（%1$s）：在 %3$s 中有一个�为 %2$s 的目录。以 %5$s 为�添加 %4$s"
 
-#: merge-recursive.c:1918
+#: merge-recursive.c:1947
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c:1958
+#: merge-recursive.c:1987
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "�索引：�能�并（�文件：%s）"
 
-#: merge-recursive.c:1962
+#: merge-recursive.c:1991
 msgid "Already up to date!"
 msgstr "已�是最新的�"
 
-#: merge-recursive.c:1971
+#: merge-recursive.c:2000
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法�并树 %s 和 %s"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2097
 msgid "Merging:"
 msgstr "�并："
 
-#: merge-recursive.c:2081
+#: merge-recursive.c:2110
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "�现 %u 个共�祖先："
 msgstr[1] "�现 %u 个共�祖先："
 
-#: merge-recursive.c:2120
+#: merge-recursive.c:2149
 msgid "merge returned no commit"
 msgstr "�并未返回�交"
 
-#: merge-recursive.c:2183
+#: merge-recursive.c:2212
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�能解�对象 '%s'"
 
-#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
 msgid "Unable to write index."
 msgstr "�能写入索引。"
 
@@ -2438,16 +2454,16 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "您尚未结�注释�并（存在 %s）。"
 
-#: notes-utils.c:42
+#: notes-utils.c:43
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "�能�交未�始化/未引用的注解树"
 
-#: notes-utils.c:101
+#: notes-utils.c:102
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "�的 notes.rewriteMode 值：'%s'"
 
-#: notes-utils.c:111
+#: notes-utils.c:112
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "拒�� %s（在 refs/notes/ 之外）写入注解"
@@ -2456,7 +2472,7 @@ msgstr "拒�� %s（在 refs/notes/ 之外）写入注解"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c:141
+#: notes-utils.c:142
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "�的 %s 值：'%s'"
@@ -2466,25 +2482,25 @@ msgstr "�的 %s 值：'%s'"
 msgid "unable to parse object: %s"
 msgstr "�能解�对象：%s"
 
-#: packfile.c:556
+#: packfile.c:561
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在包文件结�之�（��的 .idx？）"
 
-#: packfile.c:1683
+#: packfile.c:1694
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
 
-#: packfile.c:1687
+#: packfile.c:1698
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "�移�越过了 %s 的包索引的结尾（被截断的索引？）"
 
-#: parse-options.c:573
+#: parse-options.c:619
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:592
+#: parse-options.c:638
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -2492,18 +2508,18 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:598
+#: parse-options.c:644
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: parse-options.c:601
+#: parse-options.c:647
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:640
+#: parse-options.c:686
 msgid "-NUM"
 msgstr "-æ•°å­—"
 
@@ -2592,7 +2608,7 @@ msgstr "路径规格 '%s' �于符�链接中"
 msgid "unable to parse --pretty format"
 msgstr "�能解� --pretty 格�"
 
-#: read-cache.c:1472
+#: read-cache.c:1473
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2601,7 +2617,7 @@ msgstr ""
 "设置了 index.version，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1482
+#: read-cache.c:1483
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2610,22 +2626,22 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
 #, c-format
 msgid "could not close '%s'"
 msgstr "�能关闭 '%s'"
 
-#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
 #, c-format
 msgid "could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: read-cache.c:2455
+#: read-cache.c:2461
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能打开 git 目录：%s"
 
-#: read-cache.c:2467
+#: read-cache.c:2473
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
@@ -2644,18 +2660,18 @@ msgstr "在隔离环境中�止更新引用"
 msgid "could not remove reference %s"
 msgstr "无法删除引用 %s"
 
-#: refs/files-backend.c:1203 refs/packed-backend.c:1524
-#: refs/packed-backend.c:1534
+#: refs/files-backend.c:1203 refs/packed-backend.c:1528
+#: refs/packed-backend.c:1538
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#: refs/files-backend.c:1206 refs/packed-backend.c:1541
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
 
-#: ref-filter.c:35 wt-status.c:1816
+#: ref-filter.c:35 wt-status.c:1842
 msgid "gone"
 msgstr "丢失"
 
@@ -2849,128 +2865,138 @@ msgstr "（头指针分离自 %s）"
 msgid "(no branch)"
 msgstr "（�分支）"
 
-#: ref-filter.c:1488 ref-filter.c:1519
+#: ref-filter.c:1364
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c:1491 ref-filter.c:1522
+#: ref-filter.c:1367
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c:1822
+#: ref-filter.c:1819
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "�法的对象于 '%s'"
 
-#: ref-filter.c:1889
+#: ref-filter.c:1886
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误�称 %s 的引用"
 
-#: ref-filter.c:1894
+#: ref-filter.c:1891
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略��的引用 %s"
 
-#: ref-filter.c:2156
+#: ref-filter.c:2152
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2250
+#: ref-filter.c:2246
 #, c-format
 msgid "malformed object name %s"
 msgstr "�法的对象� %s"
 
-#: remote.c:780
+#: remote.c:795
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�能�时获� %s 和 %s 至 %s"
 
-#: remote.c:784
+#: remote.c:799
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而� %s"
 
-#: remote.c:788
+#: remote.c:803
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s �时跟踪 %s 和 %s"
 
-#: remote.c:796
+#: remote.c:811
 msgid "Internal error"
 msgstr "内部错误"
 
-#: remote.c:1711 remote.c:1813
+#: remote.c:1726 remote.c:1828
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指�一个分支"
 
-#: remote.c:1720
+#: remote.c:1735
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1723
+#: remote.c:1738
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1729
+#: remote.c:1744
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1744
+#: remote.c:1759
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推�目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1756
+#: remote.c:1771
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置�推�的远程�务器"
 
-#: remote.c:1767
+#: remote.c:1782
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "� '%s' 推�引用规格未包� '%s'"
 
-#: remote.c:1780
+#: remote.c:1795
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推�无目标（push.default 是 'nothing'）"
 
-#: remote.c:1802
+#: remote.c:1817
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解� 'simple' 推�至一个�独的目标"
 
-#: remote.c:2106
+#: remote.c:2132
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已��存在。\n"
 
-#: remote.c:2110
+#: remote.c:2136
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" �修�）\n"
 
-#: remote.c:2113
+#: remote.c:2139
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c:2117
+#: remote.c:2143
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "您的分支和 '%s' 指���的�交。\n"
+
+#: remote.c:2146
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  （使用 \"%s\" 查看详情）\n"
+
+#: remote.c:2150
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支领先 '%s' 共 %d 个�交。\n"
 msgstr[1] "您的分支领先 '%s' 共 %d 个�交。\n"
 
-#: remote.c:2123
+#: remote.c:2156
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" ��布您的本地�交）\n"
 
-#: remote.c:2126
+#: remote.c:2159
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2979,11 +3005,11 @@ msgstr[0] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 msgstr[1] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 
 #  译者：注����导空格
-#: remote.c:2134
+#: remote.c:2167
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" �更新您的本地分支）\n"
 
-#: remote.c:2137
+#: remote.c:2170
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2999,28 +3025,28 @@ msgstr[1] ""
 "并且分别有 %d 和 %d 处��的�交。\n"
 
 #  译者：注����导空格
-#: remote.c:2147
+#: remote.c:2180
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" ��并远程分支）\n"
 
-#: revision.c:2268
+#: revision.c:2277
 msgid "your current branch appears to be broken"
 msgstr "您的当�分支好�被��"
 
-#: revision.c:2271
+#: revision.c:2280
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当�分支 '%s' 尚无任何�交"
 
-#: revision.c:2465
+#: revision.c:2477
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 与 --bisect �兼容"
 
-#: run-command.c:645
+#: run-command.c:731
 msgid "open /dev/null failed"
 msgstr "�能打开 /dev/null"
 
-#: run-command.c:1188
+#: run-command.c:1274
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -3030,55 +3056,64 @@ msgstr ""
 "�置 `git config advice.ignoredHook false` �关闭这�警告。"
 
 #: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "读�远程解包状�时收到�外的 flush 包"
+
+#: send-pack.c:143
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "�能解�远程解包状�：%s"
 
-#: send-pack.c:143
+#: send-pack.c:145
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "远程解包失败：%s"
 
-#: send-pack.c:306
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "无法为推��书签�"
 
-#: send-pack.c:419
+#: send-pack.c:421
 msgid "the receiving end does not support --signed push"
 msgstr "接收端�支�签�推�"
 
-#: send-pack.c:421
+#: send-pack.c:423
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "未��推��书，因为接收端�支�签�推�"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "the receiving end does not support --atomic push"
 msgstr "接收端�支�原�推�"
 
-#: send-pack.c:438
+#: send-pack.c:440
 msgid "the receiving end does not support push options"
 msgstr "接收端�支�推�选项"
 
-#: sequencer.c:218
+#: sequencer.c:158
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "无效的�交信�清�模� '%s'"
+
+#: sequencer.c:267
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c:220
+#: sequencer.c:269
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c:222
+#: sequencer.c:271
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:224
+#: sequencer.c:273
 #, c-format
 msgid "Unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c:281
+#: sequencer.c:330
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3086,7 +3121,7 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正�的文件"
 
-#: sequencer.c:284
+#: sequencer.c:333
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3095,43 +3130,43 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "对修正�的文件�标记，然�用 'git commit' �交"
 
-#: sequencer.c:297 sequencer.c:1718
+#: sequencer.c:346 sequencer.c:2245
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能�定 '%s'"
 
-#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
-#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
+#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "�能写入 '%s'"
 
-#: sequencer.c:304
+#: sequencer.c:353
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "�能将�行符写入 '%s'"
 
-#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
 #, c-format
-msgid "failed to finalize '%s'."
-msgstr "无法完� '%s'。"
+msgid "failed to finalize '%s'"
+msgstr "无法完� '%s'"
 
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
-#: builtin/commit.c:754 builtin/merge.c:1046
+#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
+#: builtin/commit.c:722 builtin/merge.c:1047
 #, c-format
 msgid "could not read '%s'"
 msgstr "�能读� '%s'"
 
-#: sequencer.c:358
+#: sequencer.c:405
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c:362
+#: sequencer.c:409
 msgid "commit your changes or stash them to proceed."
 msgstr "�交您的修改或贮���继续。"
 
-#: sequencer.c:391
+#: sequencer.c:438
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快进"
@@ -3139,20 +3174,20 @@ msgstr "%s：快进"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:477
+#: sequencer.c:526
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c:496
+#: sequencer.c:542
 msgid "could not resolve HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:516
+#: sequencer.c:562
 msgid "unable to update cache tree"
 msgstr "�能更新缓存树"
 
-#: sequencer.c:600
+#: sequencer.c:658
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3181,17 +3216,120 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:702
+#: sequencer.c:915
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' 钩�失败"
+
+#: sequencer.c:922
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓�和邮件地�基于登录�和主机�进行了自动设置。请检查它们正确\n"
+"与�。您�以对其进行设置以��出现本�示信�。�行如下命令在编辑器\n"
+"中编辑您的�置文件：\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"设置完毕�，您�以用下�的命令�修正本次�交所使用的用户身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:935
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓�和邮件地�基于登录�和主机�进行了自动设置。请检查它们正确\n"
+"与�。您�以对其进行设置以��出现本�示信�：\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"设置完毕�，您�以用下�的命令�修正本次�交所使用的用户身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:975
+msgid "couldn't look up newly created commit"
+msgstr "无法找到新创建的�交"
+
+#: sequencer.c:977
+msgid "could not parse newly created commit"
+msgstr "�能解�新创建的�交"
+
+#: sequencer.c:1023
+msgid "unable to resolve HEAD after creating commit"
+msgstr "创建�交�，�能解� HEAD"
+
+#: sequencer.c:1025
+msgid "detached HEAD"
+msgstr "分离头指针"
+
+#  译者：中文字符串拼接，�删除�导空格
+#: sequencer.c:1029
+msgid " (root-commit)"
+msgstr "（根�交）"
+
+#: sequencer.c:1050
+msgid "could not parse HEAD"
+msgstr "�能解� HEAD"
+
+#: sequencer.c:1052
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s �是一个�交�"
+
+#: sequencer.c:1056 builtin/commit.c:1491
+msgid "could not parse HEAD commit"
+msgstr "�能解� HEAD �交"
+
+#: sequencer.c:1107 sequencer.c:1673
+msgid "unable to parse commit author"
+msgstr "�能解��交作者"
+
+#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 无法写入树对象"
+
+#: sequencer.c:1134 sequencer.c:1186
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "�能从 '%s' 读��交说明"
+
+#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
+#: builtin/merge.c:851
+msgid "failed to write commit object"
+msgstr "无法写�交对象"
+
+#: sequencer.c:1213
 #, c-format
 msgid "could not parse commit %s"
 msgstr "�能解��交 %s"
 
-#: sequencer.c:707
+#: sequencer.c:1218
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "�能解�父�交 %s"
 
-#: sequencer.c:836
+#: sequencer.c:1347
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3202,7 +3340,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:842
+#: sequencer.c:1353
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3213,241 +3351,245 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:848 sequencer.c:873
+#: sequencer.c:1359 sequencer.c:1384
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个�交的组�。"
 
-#: sequencer.c:857 sequencer.c:2748
+#: sequencer.c:1368 sequencer.c:3265
 msgid "need a HEAD to fixup"
 msgstr "需�一个 HEAD �修�"
 
-#: sequencer.c:859
+#: sequencer.c:1370
 msgid "could not read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:861
+#: sequencer.c:1372
 msgid "could not read HEAD's commit message"
 msgstr "�能读� HEAD 的�交说明"
 
-#: sequencer.c:867
+#: sequencer.c:1378
 #, c-format
 msgid "cannot write '%s'"
 msgstr "�能写 '%s'"
 
-#: sequencer.c:876 git-rebase--interactive.sh:446
+#: sequencer.c:1387 git-rebase--interactive.sh:452
 msgid "This is the 1st commit message:"
 msgstr "这是第一个�交说明："
 
-#: sequencer.c:884
+#: sequencer.c:1395
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能读� %s 的�交说明"
 
-#: sequencer.c:891
+#: sequencer.c:1402
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是�交说明 #%d："
 
-#: sequencer.c:896
+#: sequencer.c:1407
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "�交说明 #%d 将被跳过："
 
-#: sequencer.c:901
+#: sequencer.c:1412
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:967
+#: sequencer.c:1479
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完��并。"
 
-#: sequencer.c:986
+#: sequencer.c:1498
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一个�并�交但未�供 -m 选项。"
 
-#: sequencer.c:994
+#: sequencer.c:1506
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 没有第 %d 个父�交"
 
-#: sequencer.c:998
+#: sequencer.c:1510
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "指定了主线，但是�交 %s �是一个�并�交。"
 
-#: sequencer.c:1004
+#: sequencer.c:1516
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "�能得到 %s 的�交说明"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1023
+#: sequencer.c:1535
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:1086 sequencer.c:1867
+#: sequencer.c:1600 sequencer.c:2397
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能将 '%s' �命�为 '%s'"
 
-#: sequencer.c:1137
+#: sequencer.c:1654
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能还原 %s... %s"
 
-#: sequencer.c:1138
+#: sequencer.c:1655
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能应用 %s... %s"
 
-#: sequencer.c:1180
+#: sequencer.c:1702
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:1190
+#: sequencer.c:1712
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读�索引"
 
-#: sequencer.c:1196
+#: sequencer.c:1718
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:1270
+#: sequencer.c:1792
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s �接��数：'%s'"
 
-#: sequencer.c:1279
+#: sequencer.c:1801
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的�数"
 
-#: sequencer.c:1322
+#: sequencer.c:1844
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:1330
+#: sequencer.c:1852
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父�交的情况下�能 '%s'"
 
-#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
-#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
 #, c-format
 msgid "could not read '%s'."
 msgstr "�能读� '%s'。"
 
-#: sequencer.c:1375
+#: sequencer.c:1906
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' �修改。"
 
-#: sequencer.c:1377
+#: sequencer.c:1908
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清�：'%s'"
 
-#: sequencer.c:1382
+#: sequencer.c:1913
 msgid "no commits parsed."
 msgstr "没有解��交。"
 
-#: sequencer.c:1393
+#: sequencer.c:1924
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在回退中执行拣选。"
 
-#: sequencer.c:1395
+#: sequencer.c:1926
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在拣选中执行回退。"
 
-#: sequencer.c:1462
+#: sequencer.c:1993
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键�：%s"
 
-#: sequencer.c:1465
+#: sequencer.c:1996
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:1531
+#: sequencer.c:2062
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "�法的选项清�：'%s'"
 
-#: sequencer.c:1569
+#: sequencer.c:2100
 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原�作已在进行"
 
-#: sequencer.c:1570
+#: sequencer.c:2101
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "�试 \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1573
+#: sequencer.c:2104
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能创建�列目录 '%s'"
 
-#: sequencer.c:1588
+#: sequencer.c:2118
 msgid "could not lock HEAD"
 msgstr "�能�定 HEAD"
 
-#: sequencer.c:1646 sequencer.c:2230
+#: sequencer.c:2173 sequencer.c:2761
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原�作并未进行"
 
-#: sequencer.c:1648
+#: sequencer.c:2175
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1650 sequencer.c:1685
+#: sequencer.c:2177 sequencer.c:2212
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能从尚未建立的分支终止"
 
-#: sequencer.c:1671 builtin/grep.c:713
+#: sequencer.c:2198 builtin/grep.c:720
 #, c-format
 msgid "cannot open '%s'"
 msgstr "�能打开 '%s'"
 
-#: sequencer.c:1673
+#: sequencer.c:2200
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能读� '%s'：%s"
 
-#: sequencer.c:1674
+#: sequencer.c:2201
 msgid "unexpected end of file"
 msgstr "�外的文件结�"
 
-#: sequencer.c:1680
+#: sequencer.c:2207
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�存拣选�交�的 HEAD 文件 '%s' ��"
 
-#: sequencer.c:1691
+#: sequencer.c:2218
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移动了 HEAD。未能回退，检查您的 HEAD�"
 
-#: sequencer.c:1832 sequencer.c:2128
+#: sequencer.c:2324 sequencer.c:2679
+#, c-format
+msgid "could not update %s"
+msgstr "�能更新 %s"
+
+#: sequencer.c:2362 sequencer.c:2659
 msgid "cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:1872 builtin/difftool.c:639
+#: sequencer.c:2402 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能拷� '%s' 至 '%s'"
 
-#: sequencer.c:1891
+#: sequencer.c:2421
 msgid "could not read index"
 msgstr "�能读�索引"
 
 #  译者：注����导空格
-#: sequencer.c:1896
+#: sequencer.c:2426
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3462,11 +3604,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1902
+#: sequencer.c:2432
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:1908
+#: sequencer.c:2438
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3483,17 +3625,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1967
+#: sequencer.c:2497
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已应用 autostash。\n"
 
-#: sequencer.c:1979
+#: sequencer.c:2509
 #, c-format
 msgid "cannot store %s"
 msgstr "�能存储 %s"
 
-#: sequencer.c:1982 git-rebase.sh:175
+#: sequencer.c:2512 git-rebase.sh:178
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3504,57 +3646,52 @@ msgstr ""
 "您的修改安全地�存在贮�区中。\n"
 "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2595
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:2106
+#: sequencer.c:2637
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:2136
+#: sequencer.c:2667
 msgid "could not read orig-head"
 msgstr "�能读� orig-head"
 
-#: sequencer.c:2141 sequencer.c:2745
+#: sequencer.c:2672 sequencer.c:3262
 msgid "could not read 'onto'"
 msgstr "�能读� 'onto'"
 
-#: sequencer.c:2148
-#, c-format
-msgid "could not update %s"
-msgstr "�能更新 %s"
-
-#: sequencer.c:2155
+#: sequencer.c:2686
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 为 %s"
 
-#: sequencer.c:2239
+#: sequencer.c:2770
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�基：您有未暂存的�更。"
 
-#: sequencer.c:2244
+#: sequencer.c:2775
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:2253
+#: sequencer.c:2784
 msgid "cannot amend non-existing commit"
 msgstr "�能修补�存在的�交"
 
-#: sequencer.c:2255
+#: sequencer.c:2786
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:2257
+#: sequencer.c:2788
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:2260
+#: sequencer.c:2791
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3563,44 +3700,44 @@ msgstr ""
 "\n"
 "您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
 
-#: sequencer.c:2270
+#: sequencer.c:2801
 msgid "could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: sequencer.c:2350
+#: sequencer.c:2881
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能拣选一个%s"
 
-#: sequencer.c:2354
+#: sequencer.c:2885
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:2387
+#: sequencer.c:2918
 msgid "can't revert as initial commit"
 msgstr "�能作为�始�交回退"
 
-#: sequencer.c:2492
+#: sequencer.c:3023
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能处�的选项"
 
-#: sequencer.c:2495
+#: sequencer.c:3026
 msgid "make_script: error preparing revisions"
 msgstr "make_script：准备版本时错误"
 
-#: sequencer.c:2529 sequencer.c:2564
+#: sequencer.c:3060 sequencer.c:3095
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "��用的待办列表：'%s'"
 
-#: sequencer.c:2615
+#: sequencer.c:3146
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
 
-#: sequencer.c:2695
+#: sequencer.c:3212
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3609,7 +3746,7 @@ msgstr ""
 "警告：一些�交�能被�外丢弃。\n"
 "丢弃的�交（从新到旧）：\n"
 
-#: sequencer.c:2702
+#: sequencer.c:3219
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3625,7 +3762,7 @@ msgstr ""
 "�选值有：ignore�warn�error。\n"
 "\n"
 
-#: sequencer.c:2714
+#: sequencer.c:3231
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3635,21 +3772,26 @@ msgstr ""
 "您�以用 'git rebase --edit-todo' 修正，然�执行 'git rebase --continue'。\n"
 "或者您�以用 'git rebase --abort' 终止�基。\n"
 
-#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: sequencer.c:2775
+#: sequencer.c:3285
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "�能解��交 '%s'"
 
-#: sequencer.c:2897
+#: sequencer.c:3401
 msgid "the script was already rearranged."
 msgstr "脚本已��新编排。"
 
+#: setup.c:122
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s' 在仓库之外"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3670,6 +3812,11 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
+#: setup.c:233
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "选项 '%s' 必须在其他�选项�数之�"
+
 #: setup.c:252
 #, c-format
 msgid ""
@@ -3681,72 +3828,142 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:501
+#: setup.c:388
+msgid "unable to set up work tree using invalid config"
+msgstr "无法使用无效�置�创建工作区"
+
+#: setup.c:395
+msgid "this operation must be run in a work tree"
+msgstr "该�作必须在一个工作区中�行"
+
+#: setup.c:506
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，�得到 %d"
 
-#: setup.c:509
+#: setup.c:514
 msgid "unknown repository extensions found:"
 msgstr "�现未知的仓库扩展："
 
-#: setup.c:811
+#: setup.c:533
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "�是一个 git 仓库（或者任何父目录）：%s"
+msgid "error opening '%s'"
+msgstr "无法打开 '%s'"
 
-#: setup.c:813 builtin/index-pack.c:1653
-msgid "Cannot come back to cwd"
+#: setup.c:535
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "文件太大，无法作为 .git 文件：'%s'"
+
+#: setup.c:537
+#, c-format
+msgid "error reading %s"
+msgstr "无法读� %s"
+
+#: setup.c:539
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "无效的 gitfile 格�：%s"
+
+#: setup.c:541
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "在 gitfile 中没有路径：%s"
+
+#: setup.c:543
+#, c-format
+msgid "not a git repository: %s"
+msgstr "�是一个 git 仓库：%s"
+
+#: setup.c:642
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' 太大"
+
+#: setup.c:656
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "�是一个 git 仓库：'%s'"
+
+#: setup.c:685 setup.c:687 setup.c:718
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "�能切�目录到 '%s'"
+
+#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+msgid "cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: setup.c:1052
+#: setup.c:816
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "�是一个 git 仓库（或者任何父目录）：%s"
+
+#: setup.c:827
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "无法获� '%*s%s%s' 状�（stat）"
+
+#: setup.c:1057
 msgid "Unable to read current working directory"
 msgstr "�能读�当�工作目录"
 
-#: setup.c:1064 setup.c:1070
+#: setup.c:1069 setup.c:1075
 #, c-format
-msgid "Cannot change to '%s'"
+msgid "cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1083
+#: setup.c:1088
 #, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"�是一个 git 仓库（或者�上递归至挂载点 %s 的任何祖先目录）\n"
+"�是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
 "�止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1167
+#: setup.c:1172
 #, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"�数 core.sharedRepository 的文件��值有错（0%.3o）。\n"
+"�数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
 "文件属主必须始终拥有读写��。"
 
-#: sha1_file.c:598
+#: setup.c:1215
+msgid "open /dev/null or dup failed"
+msgstr "�能打开或者�制 /dev/null"
+
+#: setup.c:1230
+msgid "fork failed"
+msgstr "fork 失败"
+
+#: setup.c:1235
+msgid "setsid failed"
+msgstr "setsid 失败"
+
+#: sha1_file.c:592
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' �存在"
 
-#: sha1_file.c:624
+#: sha1_file.c:618
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
 
-#: sha1_file.c:630
+#: sha1_file.c:624
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "�考仓库 '%s' �是一个本地仓库。"
 
-#: sha1_file.c:636
+#: sha1_file.c:630
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "�考仓库 '%s' 是一个浅克隆"
 
-#: sha1_file.c:644
+#: sha1_file.c:638
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "�考仓库 '%s' 已被�接"
@@ -3819,7 +4036,7 @@ msgstr "路径规格 '%s' 在�模组 '%.*s' 中"
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "�模组�目 '%s'（%s）是一个 %s，�是一个�交"
 
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解�为有效引用。"
 
@@ -3843,24 +4060,24 @@ msgstr "无法在�模组 '%s' 中执行 'git status'"
 msgid "submodule '%s' has dirty index"
 msgstr "�模组 '%s' 中有�索引"
 
-#: submodule.c:1876
+#: submodule.c:1878
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "�支�对有多个工作区的�模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c:1888 submodule.c:1944
+#: submodule.c:1890 submodule.c:1946
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "�能查询�模组 '%s' 的�称"
 
-#: submodule.c:1892 builtin/submodule--helper.c:909
-#: builtin/submodule--helper.c:919
+#: submodule.c:1894 builtin/submodule--helper.c:1246
+#: builtin/submodule--helper.c:1256
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: submodule.c:1895
+#: submodule.c:1897
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3871,20 +4088,20 @@ msgstr ""
 "'%s' �移至\n"
 "'%s'\n"
 
-#: submodule.c:1979
+#: submodule.c:1981
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "无法递归进�模组路径 '%s'"
 
-#: submodule.c:2023
+#: submodule.c:2025
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中�动 ls-files"
 
-#: submodule.c:2043
+#: submodule.c:2045
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG：返回的路径和当�路径�匹�？"
 
-#: submodule.c:2062
+#: submodule.c:2064
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
@@ -3962,14 +4179,14 @@ msgstr "将�设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
 msgid "transport: invalid depth option '%s'"
 msgstr "传输：无效的深度选项 '%s'"
 
-#: transport.c:904
+#: transport.c:916
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列�模组路径所包�的修改在任何远程�中都找�到：\n"
 
-#: transport.c:908
+#: transport.c:920
 #, c-format
 msgid ""
 "\n"
@@ -3996,11 +4213,11 @@ msgstr ""
 "以推�至远程。\n"
 "\n"
 
-#: transport.c:916
+#: transport.c:928
 msgid "Aborting."
 msgstr "正在终止。"
 
-#: transport-helper.c:1074
+#: transport-helper.c:1079
 #, c-format
 msgid "Could not read ref %s"
 msgstr "�能读�引用 %s"
@@ -4021,7 +4238,7 @@ msgstr "树对象�目中空的文件�"
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4030,7 +4247,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s请在切�分支��交或贮�您的修改。"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4039,7 +4256,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4048,7 +4265,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s请在�并��交或贮�您的修改。"
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4057,7 +4274,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4066,7 +4283,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s请在 %s 之��交或贮�您的修改。"
 
-#: unpack-trees.c:119
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4075,7 +4292,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:124
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4084,7 +4301,7 @@ msgstr ""
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4093,7 +4310,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s请在切�分支之�移动或删除。"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4102,7 +4319,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4111,7 +4328,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s请在�并�移动或删除。"
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4120,7 +4337,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4129,7 +4346,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:140
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4138,7 +4355,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4148,7 +4365,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s请在切�分支�移动或删除。"
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4158,7 +4375,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4167,7 +4384,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s请在�并�移动或删除。"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4176,7 +4393,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4185,7 +4402,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:157
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4194,12 +4411,12 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "�目 '%s' 和 '%s' ��。无法�并。"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -4208,7 +4425,7 @@ msgstr ""
 "无法更新稀�检出：如下�目�是最新：\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4218,7 +4435,7 @@ msgstr ""
 "工作区中下列文件将被稀�检出更新所覆盖：\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4228,7 +4445,7 @@ msgstr ""
 "工作区中下列文件将被稀�检出更新所删除：\n"
 "%s"
 
-#: unpack-trees.c:173
+#: unpack-trees.c:174
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4237,12 +4454,12 @@ msgstr ""
 "无法更新�模组：\n"
 "%s"
 
-#: unpack-trees.c:250
+#: unpack-trees.c:251
 #, c-format
 msgid "Aborting\n"
 msgstr "终止中\n"
 
-#: unpack-trees.c:332
+#: unpack-trees.c:333
 msgid "Checking out files"
 msgstr "正在检出文件"
 
@@ -4275,18 +4492,43 @@ msgstr "无效的端��"
 msgid "invalid '..' path segment"
 msgstr "无效的 '..' 路径片段"
 
-#: worktree.c:245
+#: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 msgstr "无法读� '%s'"
 
+#: worktree.c:291
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "在主工作区的 '%s' �是仓库目录"
+
+#: worktree.c:302
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "文件 '%s' �包�工作区的�对路径"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' �存在"
+
+#: worktree.c:320
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' �是一个 .git 文件，错误� %d"
+
+#: worktree.c:328
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' 没有指回到 '%s'"
+
 #: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: builtin/am.c:862 builtin/merge.c:1044
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读�"
@@ -4300,162 +4542,162 @@ msgstr "�能访问 '%s'"
 msgid "unable to get current working directory"
 msgstr "�能获�当�工作目录"
 
-#: wt-status.c:150
+#: wt-status.c:151
 msgid "Unmerged paths:"
 msgstr "未�并的路径："
 
 #  译者：注����导空格
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:178 wt-status.c:205
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <文件>...\" 以�消暂存）"
 
 #  译者：注����导空格
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:180 wt-status.c:207
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <文件>...\" 以�消暂存）"
 
 #  译者：注����导空格
-#: wt-status.c:183
+#: wt-status.c:184
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
 
 #  译者：注����导空格
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:186 wt-status.c:190
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 
 #  译者：注����导空格
-#: wt-status.c:187
+#: wt-status.c:188
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:198 wt-status.c:984
+#: wt-status.c:199 wt-status.c:1007
 msgid "Changes to be committed:"
 msgstr "��交的�更："
 
-#: wt-status.c:216 wt-status.c:993
+#: wt-status.c:217 wt-status.c:1016
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备�交的�更："
 
 #  译者：注����导空格
-#: wt-status.c:220
+#: wt-status.c:221
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <文件>...\" 更新��交的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:222
+#: wt-status.c:223
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <文件>...\" 更新��交的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:223
+#: wt-status.c:224
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
 
 #  译者：注����导空格
-#: wt-status.c:225
+#: wt-status.c:226
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （�交或丢弃�模组中未跟踪或修改的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:237
+#: wt-status.c:238
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <文件>...\" 以包���交的内容）"
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "both deleted:"
 msgstr "�方删除："
 
-#: wt-status.c:254
+#: wt-status.c:255
 msgid "added by us:"
 msgstr "由我们添加："
 
-#: wt-status.c:256
+#: wt-status.c:257
 msgid "deleted by them:"
 msgstr "由他们删除："
 
-#: wt-status.c:258
+#: wt-status.c:259
 msgid "added by them:"
 msgstr "由他们添加："
 
-#: wt-status.c:260
+#: wt-status.c:261
 msgid "deleted by us:"
 msgstr "由我们删除："
 
-#: wt-status.c:262
+#: wt-status.c:263
 msgid "both added:"
 msgstr "�方添加："
 
-#: wt-status.c:264
+#: wt-status.c:265
 msgid "both modified:"
 msgstr "�方修改："
 
-#: wt-status.c:274
+#: wt-status.c:275
 msgid "new file:"
 msgstr "新文件："
 
-#: wt-status.c:276
+#: wt-status.c:277
 msgid "copied:"
 msgstr "拷�："
 
-#: wt-status.c:278
+#: wt-status.c:279
 msgid "deleted:"
 msgstr "删除："
 
-#: wt-status.c:280
+#: wt-status.c:281
 msgid "modified:"
 msgstr "修改："
 
-#: wt-status.c:282
+#: wt-status.c:283
 msgid "renamed:"
 msgstr "�命�："
 
-#: wt-status.c:284
+#: wt-status.c:285
 msgid "typechange:"
 msgstr "类型�更："
 
-#: wt-status.c:286
+#: wt-status.c:287
 msgid "unknown:"
 msgstr "未知："
 
-#: wt-status.c:288
+#: wt-status.c:289
 msgid "unmerged:"
 msgstr "未�并："
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:370
+#: wt-status.c:369
 msgid "new commits, "
 msgstr "新�交, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:372
+#: wt-status.c:371
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:374
+#: wt-status.c:373
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:824
+#: wt-status.c:847
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "您的贮�区当�有 %d �记录"
 msgstr[1] "您的贮�区当�有 %d �记录"
 
-#: wt-status.c:856
+#: wt-status.c:879
 msgid "Submodules changed but not updated:"
 msgstr "�模组已修改但尚未更新："
 
-#: wt-status.c:858
+#: wt-status.c:881
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模组�更："
 
-#: wt-status.c:940
+#: wt-status.c:963
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4463,77 +4705,77 @@ msgstr ""
 "��改动或删除上�的一行。\n"
 "其下所有内容都将被忽略。"
 
-#: wt-status.c:1053
+#: wt-status.c:1076
 msgid "You have unmerged paths."
 msgstr "您有尚未�并的路径。"
 
 #  译者：注����导空格
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲�并�行 \"git commit\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止�并）"
 
-#: wt-status.c:1063
+#: wt-status.c:1086
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲�已解决但您�处于�并中。"
 
 #  译者：注����导空格
-#: wt-status.c:1066
+#: wt-status.c:1089
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结��并）"
 
-#: wt-status.c:1076
+#: wt-status.c:1099
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am �作过程中。"
 
-#: wt-status.c:1079
+#: wt-status.c:1102
 msgid "The current patch is empty."
 msgstr "当�的补�为空。"
 
 #  译者：注����导空格
-#: wt-status.c:1083
+#: wt-status.c:1106
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲�，然��行 \"git am --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1085
+#: wt-status.c:1108
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1087
+#: wt-status.c:1110
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" ��原有分支）"
 
-#: wt-status.c:1219
+#: wt-status.c:1242
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c:1221
+#: wt-status.c:1244
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c:1224
+#: wt-status.c:1247
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "最�一�命令已完�（%d �命令被执行）："
 msgstr[1] "最�的命令已完�（%d �命令被执行）："
 
-#: wt-status.c:1235
+#: wt-status.c:1258
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多��文件 %s）"
 
-#: wt-status.c:1240
+#: wt-status.c:1263
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c:1243
+#: wt-status.c:1266
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -4541,169 +4783,169 @@ msgstr[0] "接下��执行的命令（剩余 %d �命令）："
 msgstr[1] "接下��执行的命令（剩余 %d �命令）："
 
 #  译者：注����导空格
-#: wt-status.c:1251
+#: wt-status.c:1274
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" �查看和编辑）"
 
-#: wt-status.c:1264
+#: wt-status.c:1287
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作。"
 
-#: wt-status.c:1269
+#: wt-status.c:1292
 msgid "You are currently rebasing."
 msgstr "您在执行�基�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1283
+#: wt-status.c:1306
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲�，然��行 \"git rebase --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1285
+#: wt-status.c:1308
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1287
+#: wt-status.c:1310
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注����导空格
-#: wt-status.c:1293
+#: wt-status.c:1316
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1297
+#: wt-status.c:1320
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作时拆分�交。"
 
-#: wt-status.c:1302
+#: wt-status.c:1325
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行�基�作时拆分�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1305
+#: wt-status.c:1328
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录�交干净�，�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1309
+#: wt-status.c:1332
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作时编辑�交。"
 
-#: wt-status.c:1314
+#: wt-status.c:1337
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行�基�作时编辑�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1317
+#: wt-status.c:1340
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当��交）"
 
 #  译者：注����导空格
-#: wt-status.c:1319
+#: wt-status.c:1342
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满��执行 \"git rebase --continue\"）"
 
-#: wt-status.c:1329
+#: wt-status.c:1352
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1334
+#: wt-status.c:1357
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲�并�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1337
+#: wt-status.c:1360
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1339
+#: wt-status.c:1362
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以�消拣选�作）"
 
-#: wt-status.c:1348
+#: wt-status.c:1371
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行�转�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1353
+#: wt-status.c:1376
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲�并�行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1356
+#: wt-status.c:1379
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1358
+#: wt-status.c:1381
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以�消�转�交�作）"
 
-#: wt-status.c:1369
+#: wt-status.c:1392
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找�作。"
 
-#: wt-status.c:1373
+#: wt-status.c:1396
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1376
+#: wt-status.c:1399
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1573
+#: wt-status.c:1596
 msgid "On branch "
 msgstr "�于分支 "
 
-#: wt-status.c:1579
+#: wt-status.c:1602
 msgid "interactive rebase in progress; onto "
 msgstr "交互��基�作正在进行中；至 "
 
-#: wt-status.c:1581
+#: wt-status.c:1604
 msgid "rebase in progress; onto "
 msgstr "�基�作正在进行中；至 "
 
-#: wt-status.c:1586
+#: wt-status.c:1609
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.c:1588
+#: wt-status.c:1611
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c:1591
+#: wt-status.c:1614
 msgid "Not currently on any branch."
 msgstr "当��在任何分支上。"
 
-#: wt-status.c:1611
+#: wt-status.c:1634
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1612
+#: wt-status.c:1635
 msgid "No commits yet"
 msgstr "尚无�交"
 
-#: wt-status.c:1626
+#: wt-status.c:1649
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1628
+#: wt-status.c:1651
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1632
+#: wt-status.c:1655
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4713,98 +4955,102 @@ msgstr ""
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能�高速度，\n"
 "但您需��心��忘了添加新文件（�� 'git help status'）。"
 
-#: wt-status.c:1638
+#: wt-status.c:1661
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1640
+#: wt-status.c:1663
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u �数显示未跟踪的文件）"
 
-#: wt-status.c:1646
+#: wt-status.c:1669
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1651
+#: wt-status.c:1674
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入�交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c:1654
+#: wt-status.c:1677
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1657
+#: wt-status.c:1680
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "�交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1660
+#: wt-status.c:1683
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交为空，但是存在尚未跟踪的文件\n"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1663
+#: wt-status.c:1686
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件��交（创建/拷�文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1666 wt-status.c:1671
+#: wt-status.c:1689 wt-status.c:1694
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件��交\n"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1669
+#: wt-status.c:1692
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件��交（使用 -u 显示未跟踪的文件）\n"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1673
+#: wt-status.c:1696
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件��交，干净的工作区\n"
 
-#: wt-status.c:1785
+#: wt-status.c:1809
 msgid "No commits yet on "
 msgstr "尚无�交在 "
 
-#: wt-status.c:1789
+#: wt-status.c:1813
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
+#: wt-status.c:1844
+msgid "different"
+msgstr "��"
+
 #  译者：注����尾空格
-#: wt-status.c:1818 wt-status.c:1826
+#: wt-status.c:1846 wt-status.c:1854
 msgid "behind "
 msgstr "�� "
 
-#: wt-status.c:1821 wt-status.c:1824
+#: wt-status.c:1849 wt-status.c:1852
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2318
+#: wt-status.c:2358
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "�能%s：您有未暂存的�更。"
 
-#: wt-status.c:2324
+#: wt-status.c:2364
 msgid "additionally, your index contains uncommitted changes."
 msgstr "�外，您的索引中包�未�交的�更。"
 
-#: wt-status.c:2326
+#: wt-status.c:2366
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的�更。"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#: compat/precompose_utf8.c:58 builtin/clone.c:440
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "无法删除 '%s'"
@@ -4818,7 +5064,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."
 msgid "unexpected diff status %c"
 msgstr "�外的差异状� %c"
 
-#: builtin/add.c:88 builtin/commit.c:291
+#: builtin/add.c:88 builtin/commit.c:257
 msgid "updating files failed"
 msgstr "更新文件失败"
 
@@ -4866,7 +5112,7 @@ msgstr "�能应用 '%s'"
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根�您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
@@ -4876,7 +5122,7 @@ msgstr "演习"
 msgid "interactive picking"
 msgstr "交互�拣选"
 
-#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
 msgid "select hunks interactively"
 msgstr "交互�挑选数��"
 
@@ -4998,10 +5244,10 @@ msgstr "没有指定文件，也没有文件被添加。\n"
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "也许您想�执行 'git add .'？\n"
 
-#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
-#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
-#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
-#: builtin/rm.c:271 builtin/submodule--helper.c:311
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
+#: builtin/rm.c:271 builtin/submodule--helper.c:326
 msgid "index file corrupt"
 msgstr "索引文件��"
 
@@ -5053,57 +5299,57 @@ msgstr "无效的时区�移值"
 msgid "Patch format detection failed."
 msgstr "补�格�探测失败。"
 
-#: builtin/am.c:1013 builtin/clone.c:402
+#: builtin/am.c:1013 builtin/clone.c:405
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c:1017
+#: builtin/am.c:1018
 msgid "Failed to split patches."
 msgstr "无法拆分补�。"
 
-#: builtin/am.c:1146 builtin/commit.c:376
+#: builtin/am.c:1148 builtin/commit.c:342
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1160
+#: builtin/am.c:1162
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1161
+#: builtin/am.c:1163
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�跳过这一补�，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1162
+#: builtin/am.c:1164
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若��原至原始分支并�止补��作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1269
+#: builtin/am.c:1271
 msgid "Patch is empty."
 msgstr "补�为空。"
 
-#: builtin/am.c:1335
+#: builtin/am.c:1337
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1357
+#: builtin/am.c:1359
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: builtin/am.c:1550
+#: builtin/am.c:1554
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: builtin/am.c:1552
+#: builtin/am.c:1556
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引��建一个（三方�并的）基础目录树..."
 
-#: builtin/am.c:1571
+#: builtin/am.c:1575
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5111,37 +5357,28 @@ msgstr ""
 "您是�曾手动编辑过您的补�？\n"
 "无法应用补�到索引中的数�对象上。"
 
-#: builtin/am.c:1577
+#: builtin/am.c:1581
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基础版本上打补��进行三方�并..."
 
-#: builtin/am.c:1602
+#: builtin/am.c:1606
 msgid "Failed to merge in the changes."
 msgstr "无法�并�更。"
 
-#: builtin/am.c:1626 builtin/merge.c:642
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 无法写入一树对象"
-
-#: builtin/am.c:1633
+#: builtin/am.c:1637
 msgid "applying to an empty history"
 msgstr "正应用到一个空历�上"
 
-#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
-msgstr "无法写�交对象"
-
-#: builtin/am.c:1679 builtin/am.c:1683
+#: builtin/am.c:1683 builtin/am.c:1687
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s �存在。"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "标准输入没有和终端关�，�能进行交互��作。"
 
-#: builtin/am.c:1704
+#: builtin/am.c:1708
 msgid "Commit Body is:"
 msgstr "�交内容为："
 
@@ -5150,35 +5387,34 @@ msgstr "�交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1714
+#: builtin/am.c:1718
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/�[n]/编辑[e]/查看补�[v]/应用所有[a]："
 
-#: builtin/am.c:1764
+#: builtin/am.c:1768
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�索引：�能应用补�（�文件：%s）"
 
-#: builtin/am.c:1804 builtin/am.c:1876
+#: builtin/am.c:1808 builtin/am.c:1879
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1820
+#: builtin/am.c:1824
 msgid "No changes -- Patch already applied."
 msgstr "没有�更 —— 补�已�应用过。"
 
-#: builtin/am.c:1828
+#: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补�失败于 %s %.*s"
 
-#: builtin/am.c:1834
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
-msgstr "失败的补�文件副本�于：%s"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr "用 'git am --show-current-patch' 命令查看失败的补�"
 
-#: builtin/am.c:1879
+#: builtin/am.c:1882
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5188,7 +5424,7 @@ msgstr ""
 "如果没有什么�添加到暂存区的，则很�能是其它�交已�引入了相�的�更。\n"
 "您也许想�跳过这个补�。"
 
-#: builtin/am.c:1886
+#: builtin/am.c:1889
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5199,149 +5435,157 @@ msgstr ""
 "您应该对已�冲�解决的�一个文件执行 'git add' �标记已�完�。 \n"
 "你�以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
-#: builtin/reset.c:340
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�能解�对象 '%s'。"
 
-#: builtin/am.c:2045
+#: builtin/am.c:2048
 msgid "failed to clean index"
 msgstr "无法清空索引"
 
-#: builtin/am.c:2080
+#: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "您好�在上一次 'am' 失败�移动了 HEAD。未回退至 ORIG_HEAD"
 
-#: builtin/am.c:2143
+#: builtin/am.c:2174
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2210
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2211
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2217
 msgid "run interactively"
 msgstr "以交互�方��行"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2219
 msgid "historical option -- no-op"
 msgstr "�的�数 —— 无作用"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2221
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�许使用三方�并。"
 
-#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
+#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:182
 msgid "be quiet"
 msgstr "�默模�"
 
-#: builtin/am.c:2190
+#: builtin/am.c:2224
 msgid "add a Signed-off-by line to the commit message"
 msgstr "在�交说明中添加一个 Signed-off-by 签�"
 
-#: builtin/am.c:2193
+#: builtin/am.c:2227
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2229
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -k �数"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2231
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -b �数"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2233
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -m �数"
 
-#: builtin/am.c:2201
+#: builtin/am.c:2235
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格�，� git-mailsplit 传递 --keep-cr �数"
 
-#: builtin/am.c:2204
+#: builtin/am.c:2238
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "�� git-mailsplit 传递 --keep-cr �数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2207
+#: builtin/am.c:2241
 msgid "strip everything before a scissors line"
 msgstr "丢弃�切线�的所有内容"
 
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
-#: builtin/am.c:2236
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
+#: parse-options.h:144 parse-options.h:146 parse-options.h:257
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
 msgid "format"
 msgstr "格�"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2267
 msgid "format the patch(es) are in"
 msgstr "补�的格�"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2273
 msgid "override error message when patch failure occurs"
 msgstr "打补�失败时显示的错误信�"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2275
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲�解决�继续应用补�"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2278
 msgid "synonyms for --continue"
 msgstr "和 --continue �义"
 
-#: builtin/am.c:2247
+#: builtin/am.c:2281
 msgid "skip the current patch"
 msgstr "跳过当�补�"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2284
 msgid "restore the original branch and abort the patching operation."
 msgstr "��原始分支并终止打补��作。"
 
-#: builtin/am.c:2254
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "终止补��作但�� HEAD ��。"
+
+#: builtin/am.c:2290
+msgid "show the patch being applied."
+msgstr "显示正在应用的补�。"
+
+#: builtin/am.c:2294
 msgid "lie about committer date"
 msgstr "将作者日期作为�交日期"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2296
 msgid "use current timestamp for author date"
 msgstr "用当�时间作为作者日期"
 
-#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2259
+#: builtin/am.c:2299
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签��交"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2302
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2320
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5349,16 +5593,16 @@ msgstr ""
 "�数 -b/--binary 已�很长时间��任何实质�作了，并且将被移除。\n"
 "请���使用它了。"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2327
 msgid "failed to read the index"
 msgstr "无法读�索引"
 
-#: builtin/am.c:2302
+#: builtin/am.c:2342
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�基目录 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2326
+#: builtin/am.c:2366
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5367,7 +5611,7 @@ msgstr ""
 "�现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2372
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决�作未进行，我们�会继续。"
 
@@ -5389,8 +5633,8 @@ msgid "git archive: Remote with no URL"
 msgstr "git archive：未�供远程 URL"
 
 #: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive：应为 ACK/NACK，�得到 EOF"
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive：期望是 ACK/NAK，�得到 flush 包"
 
 #: builtin/archive.c:61
 #, c-format
@@ -5403,7 +5647,7 @@ msgstr "git archive：�议错误"
 
 #: builtin/archive.c:68
 msgid "git archive: expected a flush"
-msgstr "git archive：应有一个 flush 刷新"
+msgstr "git archive：应有一个 flush 包"
 
 #: builtin/bisect--helper.c:12
 msgid "git bisect--helper --next-all [--no-checkout]"
@@ -5476,107 +5720,107 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 
-#: builtin/blame.c:668
+#: builtin/blame.c:677
 msgid "Show blame entries as we find them, incrementally"
 msgstr "增��地显示�现的 blame �目"
 
-#: builtin/blame.c:669
+#: builtin/blame.c:678
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "边界�交显示空的 SHA-1（默认：关闭）"
 
-#: builtin/blame.c:670
+#: builtin/blame.c:679
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "�把根�交作为边界（默认：关闭）"
 
-#: builtin/blame.c:671
+#: builtin/blame.c:680
 msgid "Show work cost statistics"
 msgstr "显示命令消耗统计"
 
-#: builtin/blame.c:672
+#: builtin/blame.c:681
 msgid "Force progress reporting"
 msgstr "强制进度显示"
 
-#: builtin/blame.c:673
+#: builtin/blame.c:682
 msgid "Show output score for blame entries"
 msgstr "显示判断 blame �目�移的得分诊断信�"
 
-#: builtin/blame.c:674
+#: builtin/blame.c:683
 msgid "Show original filename (Default: auto)"
 msgstr "显示原始文件�（默认：自动）"
 
-#: builtin/blame.c:675
+#: builtin/blame.c:684
 msgid "Show original linenumber (Default: off)"
 msgstr "显示原始的行�（默认：关闭）"
 
-#: builtin/blame.c:676
+#: builtin/blame.c:685
 msgid "Show in a format designed for machine consumption"
 msgstr "显示为一个适�机器读�的格�"
 
-#: builtin/blame.c:677
+#: builtin/blame.c:686
 msgid "Show porcelain format with per-line commit information"
 msgstr "为�一行显示机器适用的�交信�"
 
-#: builtin/blame.c:678
+#: builtin/blame.c:687
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相�的输出模�（默认：关闭）"
 
-#: builtin/blame.c:679
+#: builtin/blame.c:688
 msgid "Show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c:680
+#: builtin/blame.c:689
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 �交�（默认：关闭）"
 
-#: builtin/blame.c:681
+#: builtin/blame.c:690
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "��作者�字和时间戳（默认：关闭）"
 
-#: builtin/blame.c:682
+#: builtin/blame.c:691
 msgid "Show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而�是�字（默认：关闭）"
 
-#: builtin/blame.c:683
+#: builtin/blame.c:692
 msgid "Ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:690
+#: builtin/blame.c:699
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "使用一个试验性的���算法改进差异显示"
 
-#: builtin/blame.c:692
+#: builtin/blame.c:701
 msgid "Spend extra cycles to find better match"
 msgstr "花费�外的循环�找到更好的匹�"
 
-#: builtin/blame.c:693
+#: builtin/blame.c:702
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "使用�自 <文件> 的修订集而�是调用 git-rev-list"
 
-#: builtin/blame.c:694
+#: builtin/blame.c:703
 msgid "Use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的图片"
 
-#: builtin/blame.c:695 builtin/blame.c:696
+#: builtin/blame.c:704 builtin/blame.c:705
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:695
+#: builtin/blame.c:704
 msgid "Find line copies within and across files"
 msgstr "找到文件内�跨文件的行拷�"
 
-#: builtin/blame.c:696
+#: builtin/blame.c:705
 msgid "Find line movements within and across files"
 msgstr "找到文件内�跨文件的行移动"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:697
+#: builtin/blame.c:706
 msgid "Process only line range n,m, counting from 1"
 msgstr "�处�行范围在 n 和 m 之间的，从 1 开始"
 
-#: builtin/blame.c:744
+#: builtin/blame.c:753
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress �能和 --incremental 或 --porcelain �时使用"
 
@@ -5588,18 +5832,18 @@ msgstr "--progress �能和 --incremental 或 --porcelain �时使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:795
+#: builtin/blame.c:804
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月�"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:890
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "文件 %s �有 %lu 行"
 msgstr[1] "文件 %s �有 %lu 行"
 
-#: builtin/blame.c:928
+#: builtin/blame.c:936
 msgid "Blaming lines"
 msgstr "追踪代�行"
 
@@ -5889,17 +6133,17 @@ msgstr "�打�尚未�并的分支"
 msgid "list branches in columns"
 msgstr "以列的方�显示分支"
 
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
 msgid "key"
 msgstr "key"
 
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
 msgid "field name to sort on"
 msgstr "排�的字段�"
 
 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:408
+#: builtin/tag.c:414
 msgid "object"
 msgstr "对象"
 
@@ -5907,16 +6151,16 @@ msgstr "对象"
 msgid "print only branches of the object"
 msgstr "�打�指�该对象的分支"
 
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
 msgid "sorting and filtering are case insensitive"
 msgstr "排�和过滤属于大�写��感"
 
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "输出格�"
 
-#: builtin/branch.c:652 builtin/clone.c:730
+#: builtin/branch.c:652 builtin/clone.c:735
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有�于 /refs/heads 之下�"
 
@@ -6011,7 +6255,7 @@ msgstr "需�一个仓库�创建包。"
 msgid "Need a repository to unbundle."
 msgstr "需�一个仓库�解包。"
 
-#: builtin/cat-file.c:521
+#: builtin/cat-file.c:523
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -6019,7 +6263,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
 
-#: builtin/cat-file.c:522
+#: builtin/cat-file.c:524
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6027,63 +6271,63 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> �以是其中之一：blob�tree�commit�tag"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:562
 msgid "show object type"
 msgstr "显示对象类型"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "show object size"
 msgstr "显示对象大�"
 
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "pretty-print object's content"
 msgstr "美观地打�对象的内容"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数�对象，对其内容�文本转�"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "for blob objects, run filters on object's content"
 msgstr "对于数�对象，对其内容�过滤"
 
-#: builtin/cat-file.c:569 git-submodule.sh:931
+#: builtin/cat-file.c:571 git-submodule.sh:878
 msgid "blob"
 msgstr "数�对象"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "use a specific path for --textconv/--filters"
 msgstr "对于 --textconv/--filters 使用一个特定的路径"
 
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "�许 -s 和 -t 对��的对象生效"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�和内容"
 
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:580
 msgid "show info about objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟�树内符�链接（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check �数显示所有对象"
 
@@ -6103,7 +6347,7 @@ msgstr "报告设置在文件上的所有属性"
 msgid "use .gitattributes only from the index"
 msgstr "�使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "从标准输入读出文件�"
 
@@ -6111,7 +6355,7 @@ msgstr "从标准输入读出文件�"
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "�显示进度报告"
 
@@ -6123,27 +6367,27 @@ msgstr "显示未匹�的输入路径"
 msgid "ignore index when checking"
 msgstr "检查时忽略索引"
 
-#: builtin/check-ignore.c:158
+#: builtin/check-ignore.c:159
 msgid "cannot specify pathnames with --stdin"
 msgstr "�能�时指定路径� --stdin �数"
 
-#: builtin/check-ignore.c:161
+#: builtin/check-ignore.c:162
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需�和 --stdin �数共用�有�义"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:164
 msgid "no path specified"
 msgstr "未指定路径"
 
-#: builtin/check-ignore.c:167
+#: builtin/check-ignore.c:168
 msgid "--quiet is only valid with a single pathname"
 msgstr "�数 --quiet �在�供一个路径�时有效"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:170
 msgid "cannot have both --quiet and --verbose"
 msgstr "�能�时�供 --quiet 和 --verbose �数"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:173
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 选项�在使用 --verbose 时有效"
 
@@ -6201,9 +6445,9 @@ msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
-#: builtin/worktree.c:552
+#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
+#: builtin/worktree.c:570
 msgid "string"
 msgstr "字符串"
 
@@ -6248,81 +6492,81 @@ msgstr "路径 '%s' 没有必须的版本"
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法�并"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加�并结果"
 
-#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
-#: builtin/checkout.c:263
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' �能在更新路径时使用"
 
-#: builtin/checkout.c:266 builtin/checkout.c:269
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' �能和 %s �时使用"
 
-#: builtin/checkout.c:272
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�时更新路径并切�到分支'%s'。"
 
-#: builtin/checkout.c:341 builtin/checkout.c:348
+#: builtin/checkout.c:340 builtin/checkout.c:347
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未�并"
 
-#: builtin/checkout.c:506
+#: builtin/checkout.c:505
 msgid "you need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
-#: builtin/checkout.c:637
+#: builtin/checkout.c:636
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能对 '%s' 执行 reflog �作：%s\n"
 
-#: builtin/checkout.c:678
+#: builtin/checkout.c:677
 msgid "HEAD is now at"
 msgstr "HEAD 目��于"
 
-#: builtin/checkout.c:682 builtin/clone.c:684
+#: builtin/checkout.c:681 builtin/clone.c:689
 msgid "unable to update HEAD"
 msgstr "�能更新 HEAD"
 
-#: builtin/checkout.c:686
+#: builtin/checkout.c:685
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�置分支 '%s'\n"
 
-#: builtin/checkout.c:689
+#: builtin/checkout.c:688
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已��于 '%s'\n"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�并�置分支 '%s'\n"
 
-#: builtin/checkout.c:695 builtin/checkout.c:1051
+#: builtin/checkout.c:694 builtin/checkout.c:1039
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:697
+#: builtin/checkout.c:696
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  译者：注����导空格
-#: builtin/checkout.c:748
+#: builtin/checkout.c:747
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 个。\n"
 
-#: builtin/checkout.c:754
+#: builtin/checkout.c:753
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6343,7 +6587,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:773
+#: builtin/checkout.c:772
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6370,160 +6614,160 @@ msgstr[1] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:814
+#: builtin/checkout.c:804
 msgid "internal error in revision walk"
 msgstr "在版本�历时�到内部错误"
 
-#: builtin/checkout.c:818
+#: builtin/checkout.c:808
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:848 builtin/checkout.c:1046
+#: builtin/checkout.c:836 builtin/checkout.c:1034
 msgid "You are on a branch yet to be born"
 msgstr "您�于一个尚未�始化的分支"
 
-#: builtin/checkout.c:952
+#: builtin/checkout.c:940
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应�有一个引用，�给出了 %d 个"
 
-#: builtin/checkout.c:992 builtin/worktree.c:247
+#: builtin/checkout.c:980 builtin/worktree.c:249
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一个树：%s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1048
 msgid "paths cannot be used with switching branches"
 msgstr "路径�能和切�分支�时使用"
 
-#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#: builtin/checkout.c:1051 builtin/checkout.c:1055
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' �能和切�分支�时使用"
 
-#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
+#: builtin/checkout.c:1070
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' �能和 '%s' �时使用"
 
-#: builtin/checkout.c:1087
+#: builtin/checkout.c:1075
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一个��交 '%s'"
 
-#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
-#: builtin/worktree.c:371
+#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
+#: builtin/worktree.c:389
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1108
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1110
 msgid "create/reset and checkout a branch"
 msgstr "创建/�置并检出一个分支"
 
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1111
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1124 builtin/worktree.c:373
+#: builtin/checkout.c:1112 builtin/worktree.c:391
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的�交分离"
 
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1113
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信�"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1115
 msgid "new unparented branch"
 msgstr "新的没有父�交的分支"
 
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1116
 msgid "checkout our version for unmerged files"
 msgstr "对尚未�并的文件检出我们的版本"
 
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1118
 msgid "checkout their version for unmerged files"
 msgstr "对尚未�并的文件检出他们的版本"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1120
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1133
+#: builtin/checkout.c:1122
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方�并"
 
-#: builtin/checkout.c:1134 builtin/merge.c:238
+#: builtin/checkout.c:1124 builtin/merge.c:239
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1127
 msgid "conflict style (merge or diff3)"
 msgstr "冲�输出风格（merge 或 diff3）"
 
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1130
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径��稀�检出的�制"
 
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1132
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "二次猜测'git checkout <无此分支>'"
 
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1134
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�检查指定的引用是�被其他工作区所�用"
 
-#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
-#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
+#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1168
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b�-B 和 --orphan 是互斥的"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1185
 msgid "--track needs a branch name"
 msgstr "--track 需�一个分支�"
 
-#: builtin/checkout.c:1199
+#: builtin/checkout.c:1190
 msgid "Missing branch name; try -b"
 msgstr "缺少分支�；�试 -b"
 
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1226
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1242
+#: builtin/checkout.c:1233
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' �是一个�交，�能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1237
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach �能接收路径�数 '%s'"
 
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1241
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6621,7 +6865,7 @@ msgstr "选择�删除的�目"
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:788 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1710
 #, c-format
 msgid "Bye.\n"
 msgstr "��。\n"
@@ -6644,11 +6888,11 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在�示符下选择的帮助"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1786
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: builtin/clean.c:824 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1783
 msgid "What now"
 msgstr "请选择"
 
@@ -6678,8 +6922,8 @@ msgstr "交互�清除"
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
-#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
+#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
 #: builtin/show-ref.c:176
 msgid "pattern"
@@ -6715,144 +6959,144 @@ msgid ""
 msgstr ""
 "clean.requireForce 默认为 true 且未�供 -i�-n 或 -f 选项，拒�执行清�动作"
 
-#: builtin/clone.c:39
+#: builtin/clone.c:40
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:83
+#: builtin/clone.c:85
 msgid "don't create a checkout"
 msgstr "�创建一个检出"
 
-#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:88
+#: builtin/clone.c:90
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜�仓库（也是纯仓库）"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:92
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:94
 msgid "don't use local hardlinks, always copy"
 msgstr "�使用本地硬链接，始终�制"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "pathspec"
 msgstr "路径规格"
 
-#: builtin/clone.c:96 builtin/clone.c:100
+#: builtin/clone.c:98 builtin/clone.c:102
 msgid "initialize submodules in the clone"
 msgstr "在克隆时�始化�模组"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:105
 msgid "number of submodules cloned in parallel"
 msgstr "并�克隆的�模组的数�"
 
-#: builtin/clone.c:104 builtin/init-db.c:476
+#: builtin/clone.c:106 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "模�目录"
 
-#: builtin/clone.c:105 builtin/init-db.c:477
+#: builtin/clone.c:107 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "模�目录将被使用"
 
-#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
-#: builtin/submodule--helper.c:1240
+#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1577
 msgid "reference repository"
 msgstr "�考仓库"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:113
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时�考 --reference 指�的本地仓库"
 
-#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "�称"
 
-#: builtin/clone.c:113
+#: builtin/clone.c:115
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <�称> 而�是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:115
+#: builtin/clone.c:117
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而�是远程 HEAD"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:119
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
 #: builtin/pull.c:211
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:121
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
-#: parse-options.h:142
+#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: parse-options.h:154
 msgid "time"
 msgstr "时间"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:123
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:122 builtin/fetch.c:142
+#: builtin/clone.c:124 builtin/fetch.c:155
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c:123 builtin/fetch.c:143
+#: builtin/clone.c:125 builtin/fetch.c:156
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历�，除了特定版本"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:127
 msgid "clone only one branch, HEAD or --branch"
 msgstr "�克隆一个分支�HEAD 或 --branch"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:129
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "��克隆任何标签，并且�续获��作也�下载它们"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:131
 msgid "any cloned submodules will be shallow"
 msgstr "�模组将以浅下载模�克隆"
 
-#: builtin/clone.c:130 builtin/init-db.c:485
+#: builtin/clone.c:132 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:131 builtin/init-db.c:486
+#: builtin/clone.c:133 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:134
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:135
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置�置信�"
 
-#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
 #: builtin/push.c:567
 msgid "use IPv4 addresses only"
 msgstr "�使用 IPv4 地�"
 
-#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
 #: builtin/push.c:569
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 地�"
 
-#: builtin/clone.c:273
+#: builtin/clone.c:276
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6860,42 +7104,42 @@ msgstr ""
 "无法猜到目录�。\n"
 "请在命令行指定一个目录"
 
-#: builtin/clone.c:326
+#: builtin/clone.c:329
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: �能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:398
+#: builtin/clone.c:401
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/clone.c:406
+#: builtin/clone.c:409
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且�是一个目录"
 
-#: builtin/clone.c:420
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "对 %s 调用 stat 失败\n"
 
-#: builtin/clone.c:442
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c:446
+#: builtin/clone.c:449
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷�文件至 '%s'"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:475
 #, c-format
 msgid "done.\n"
 msgstr "完�。\n"
 
-#: builtin/clone.c:484
+#: builtin/clone.c:489
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6905,130 +7149,134 @@ msgstr ""
 "您�以通过 'git status' 检查哪些已被检出，然�使用命令\n"
 "'git checkout -f HEAD' �试\n"
 
-#: builtin/clone.c:561
+#: builtin/clone.c:566
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�能�现�克隆的远程分支 %s。"
 
-#: builtin/clone.c:656
+#: builtin/clone.c:661
 msgid "remote did not send all necessary objects"
 msgstr "远程没有��所有必须的对象"
 
-#: builtin/clone.c:672
+#: builtin/clone.c:677
 #, c-format
 msgid "unable to update %s"
 msgstr "�能更新 %s"
 
-#: builtin/clone.c:721
+#: builtin/clone.c:726
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指�一个�存在的引用，无法检出。\n"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
 msgid "unable to checkout working tree"
 msgstr "�能检出工作区"
 
-#: builtin/clone.c:796
+#: builtin/clone.c:801
 msgid "unable to write parameters to config file"
 msgstr "无法将�数写入�置文件"
 
-#: builtin/clone.c:859
+#: builtin/clone.c:864
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack �清�"
 
-#: builtin/clone.c:861
+#: builtin/clone.c:866
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:894 builtin/receive-pack.c:1945
+#: builtin/clone.c:906 builtin/receive-pack.c:1946
 msgid "Too many arguments."
 msgstr "太多�数。"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:910
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库�克隆。"
 
-#: builtin/clone.c:911
+#: builtin/clone.c:923
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项�兼容。"
 
-#: builtin/clone.c:914
+#: builtin/clone.c:926
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项�兼容。"
 
-#: builtin/clone.c:927
+#: builtin/clone.c:939
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' �存在"
 
-#: builtin/clone.c:933 builtin/fetch.c:1358
+#: builtin/clone.c:945 builtin/fetch.c:1455
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一个正数"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:955
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已�存在，并且�是一个空目录。"
 
-#: builtin/clone.c:953
+#: builtin/clone.c:965
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已�存在。"
 
-#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
-#: builtin/worktree.c:253 builtin/worktree.c:283
+#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
+#: builtin/worktree.c:255 builtin/worktree.c:285
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "�能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:971
+#: builtin/clone.c:985
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "�能创建工作区目录 '%s'"
 
-#: builtin/clone.c:983
+#: builtin/clone.c:1005
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:985
+#: builtin/clone.c:1007
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1031
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以� --reference-if-able �兼容"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1093
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1073
+#: builtin/clone.c:1095
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1075
+#: builtin/clone.c:1097
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1078
+#: builtin/clone.c:1099
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter 在本地克隆时被忽略，请改用 file:// �议。"
+
+#: builtin/clone.c:1102
 msgid "source repository is shallow, ignoring --local"
 msgstr "�仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1107
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1139 builtin/clone.c:1147
+#: builtin/clone.c:1169 builtin/clone.c:1177
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未�现"
 
-#: builtin/clone.c:1150
+#: builtin/clone.c:1180
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
@@ -7064,62 +7312,15 @@ msgstr "两列之间的填充空间"
 msgid "--command must be the first argument"
 msgstr "--command 必须是第一个�数"
 
-#: builtin/commit.c:39
+#: builtin/commit.c:37
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:44
+#: builtin/commit.c:42
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"您的姓�和邮件地�基于登录�和主机�进行了自动设置。请检查它们正确\n"
-"与�。您�以对其进行设置以��出现本�示信�。�行如下命令在编辑器\n"
-"中编辑您的�置文件：\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"设置完毕�，您�以用下�的命令�修正本次�交所使用的用户身份：\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
-msgstr ""
-"您的姓�和邮件地�基于登录�和主机�进行了自动设置。请检查它们正确\n"
-"与�。您�以对其进行设置以��出现本�示信�：\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"设置完毕�，您�以用下�的命令�修正本次�交所使用的用户身份：\n"
-"\n"
-"    git commit --amend --reset-author\n"
-
-#: builtin/commit.c:74
+#: builtin/commit.c:47
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7128,7 +7329,7 @@ msgstr ""
 "您�修补最近的�交，但这么�会让它�为空�交。您�以��您的命令并带上\n"
 "--allow-empty 选项，或者您�用命令 \"git reset HEAD^\" 整个删除该�交。\n"
 
-#: builtin/commit.c:79
+#: builtin/commit.c:52
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7142,11 +7343,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:86
+#: builtin/commit.c:59
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "�则，请使用命令 'git reset'\n"
 
-#: builtin/commit.c:89
+#: builtin/commit.c:62
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7162,98 +7363,98 @@ msgstr ""
 "然�执行 \"git cherry-pick --continue\" 继续对其余�交执行拣选\n"
 "�作。\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:284
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:325
 msgid "unable to create temporary index"
 msgstr "�能创建临时索引"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:331
 msgid "interactive add failed"
 msgstr "交互�添加失败"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:344
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:346
 msgid "Failed to update main cache tree"
 msgstr "�能更新树的主缓存"
 
-#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:427
 msgid "cannot do a partial commit during a merge."
 msgstr "在�并过程中�能�部分�交。"
 
-#: builtin/commit.c:463
+#: builtin/commit.c:429
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中�能�部分�交。"
 
-#: builtin/commit.c:471
+#: builtin/commit.c:437
 msgid "cannot read the index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:490
+#: builtin/commit.c:456
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:587
+#: builtin/commit.c:553
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "�交 '%s' 缺少作者信�"
 
-#: builtin/commit.c:589
+#: builtin/commit.c:555
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "�交 '%s' 有�法的作者信�"
 
-#: builtin/commit.c:608
+#: builtin/commit.c:574
 msgid "malformed --author parameter"
 msgstr "�法的 --author �数"
 
-#: builtin/commit.c:660
+#: builtin/commit.c:626
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当��交说明使用的注释字符"
 
-#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�能查询�交 %s"
 
-#: builtin/commit.c:709 builtin/shortlog.c:309
+#: builtin/commit.c:675 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读�日志信�）\n"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:677
 msgid "could not read log from standard input"
 msgstr "�能从标准输入中读�日志信�"
 
-#: builtin/commit.c:715
+#: builtin/commit.c:681
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "�能读�日志文件 '%s'"
 
-#: builtin/commit.c:742 builtin/commit.c:750
+#: builtin/commit.c:710 builtin/commit.c:718
 msgid "could not read SQUASH_MSG"
 msgstr "�能读� SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:715
 msgid "could not read MERGE_MSG"
 msgstr "�能读� MERGE_MSG"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:769
 msgid "could not write commit template"
 msgstr "�能写�交模版"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:787
 #, c-format
 msgid ""
 "\n"
@@ -7267,7 +7468,7 @@ msgstr ""
 "\t%s\n"
 "然��试。\n"
 
-#: builtin/commit.c:824
+#: builtin/commit.c:792
 #, c-format
 msgid ""
 "\n"
@@ -7281,7 +7482,7 @@ msgstr ""
 "\t%s\n"
 "然��试。\n"
 
-#: builtin/commit.c:837
+#: builtin/commit.c:805
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7290,7 +7491,7 @@ msgstr ""
 "请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
 "说明将会终止�交。\n"
 
-#: builtin/commit.c:844
+#: builtin/commit.c:813
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7301,362 +7502,342 @@ msgstr ""
 "也�以删除它们。一个空的�交说明将会终止�交。\n"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:861
+#: builtin/commit.c:830
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:869
+#: builtin/commit.c:838
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:876
+#: builtin/commit.c:845
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s�交者：%.*s <%.*s>"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:862
 msgid "Cannot read index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:959
+#: builtin/commit.c:928
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:973 builtin/tag.c:252
+#: builtin/commit.c:942 builtin/tag.c:256
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项�供�交说明。\n"
 
-#: builtin/commit.c:1076
+#: builtin/commit.c:986
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' �是 '姓� <邮箱>' 格�，且未能在现有作者中找到匹�"
 
-#: builtin/commit.c:1090
+#: builtin/commit.c:1000
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模� '%s'"
 
-#: builtin/commit.c:1104 builtin/commit.c:1349
+#: builtin/commit.c:1014 builtin/commit.c:1264
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件�数 '%s'"
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1052
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项�兼容"
 
-#: builtin/commit.c:1172
+#: builtin/commit.c:1085
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�时使用 --reset-author 和 --author 没有�义"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1094
 msgid "You have nothing to amend."
 msgstr "您没有�修补的�交。"
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1097
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个�并过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1186
+#: builtin/commit.c:1099
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1189
+#: builtin/commit.c:1102
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup �能�时使用"
 
-#: builtin/commit.c:1199
+#: builtin/commit.c:1112
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1201
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "选项 -m �能和 -c/-C/-F/--fixup �时使用。"
+#: builtin/commit.c:1114
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "选项 -m �能和 -c/-C/-F �时使用。"
 
-#: builtin/commit.c:1209
+#: builtin/commit.c:1122
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author �能和 -C�-c 或 --amend �时使用。"
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1139
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "�能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
-#: builtin/commit.c:1228
+#: builtin/commit.c:1141
 msgid "No paths with --include/--only does not make sense."
 msgstr "�数 --include/--only �跟路径没有�义。"
 
-#: builtin/commit.c:1240 builtin/tag.c:535
+#: builtin/commit.c:1155 builtin/tag.c:542
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清�模� %s"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1160
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项�时使用没有�义。"
 
-#: builtin/commit.c:1363 builtin/commit.c:1648
+#: builtin/commit.c:1278 builtin/commit.c:1443
 msgid "show status concisely"
 msgstr "以简�的格�显示状�"
 
-#: builtin/commit.c:1365 builtin/commit.c:1650
+#: builtin/commit.c:1280 builtin/commit.c:1445
 msgid "show branch information"
 msgstr "显示分支信�"
 
-#: builtin/commit.c:1367
+#: builtin/commit.c:1282
 msgid "show stash information"
 msgstr "显示贮�区信�"
 
-#: builtin/commit.c:1369
+#: builtin/commit.c:1284 builtin/commit.c:1447
+msgid "compute full ahead/behind values"
+msgstr "计算完整的领先/��值"
+
+#: builtin/commit.c:1286
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
-#: builtin/worktree.c:523
+#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
+#: builtin/worktree.c:541
 msgid "machine-readable output"
 msgstr "机器�读的输出"
 
-#: builtin/commit.c:1372 builtin/commit.c:1654
+#: builtin/commit.c:1289 builtin/commit.c:1451
 msgid "show status in long format (default)"
 msgstr "以长格�显示状�（默认）"
 
-#: builtin/commit.c:1375 builtin/commit.c:1657
+#: builtin/commit.c:1292 builtin/commit.c:1454
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字符结尾"
 
-#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
 msgid "mode"
 msgstr "模�"
 
-#: builtin/commit.c:1378 builtin/commit.c:1660
+#: builtin/commit.c:1295 builtin/commit.c:1457
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模��的�选�数：all�normal�no。（默认：all）"
 
-#: builtin/commit.c:1382
+#: builtin/commit.c:1299
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
-msgstr "显示已忽略的文件，�选模�：traditional�matching�no。（默认：traditional）"
+msgstr ""
+"显示已忽略的文件，�选模�：traditional�matching�no。（默认：traditional）"
 
-#: builtin/commit.c:1384 parse-options.h:155
+#: builtin/commit.c:1301 parse-options.h:167
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1385
+#: builtin/commit.c:1302
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模组的更改，“何时�的�选�数：all�dirty�untracked。（默认：all）"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1304
 msgid "list untracked files in columns"
 msgstr "以列的方�显示未跟踪的文件"
 
-#: builtin/commit.c:1406
+#: builtin/commit.c:1323
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�支�已忽略和未跟踪文件�数的组�"
 
-#: builtin/commit.c:1469
-msgid "couldn't look up newly created commit"
-msgstr "无法找到新创建的�交"
-
-#: builtin/commit.c:1471
-msgid "could not parse newly created commit"
-msgstr "�能解�新创建的�交"
-
-#: builtin/commit.c:1516
-msgid "unable to resolve HEAD after creating commit"
-msgstr "创建�交�，�能解� HEAD"
-
-#: builtin/commit.c:1518
-msgid "detached HEAD"
-msgstr "分离头指针"
-
-#  译者：中文字符串拼接，�删除�导空格
-#: builtin/commit.c:1521
-msgid " (root-commit)"
-msgstr "（根�交）"
-
-#: builtin/commit.c:1618
+#: builtin/commit.c:1413
 msgid "suppress summary after successful commit"
 msgstr "�交�功��显示概述信�"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1414
 msgid "show diff in commit message template"
 msgstr "在�交说明模�里显示差异"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1416
 msgid "Commit message options"
 msgstr "�交说明选项"
 
-#: builtin/commit.c:1622 builtin/tag.c:388
+#: builtin/commit.c:1417 builtin/tag.c:393
 msgid "read message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1418
 msgid "override author for commit"
 msgstr "�交时覆盖作者"
 
-#: builtin/commit.c:1624 builtin/gc.c:359
+#: builtin/commit.c:1419 builtin/gc.c:359
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1419
 msgid "override date for commit"
 msgstr "�交时覆盖日期"
 
-#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:386
+#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:391
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1420
 msgid "commit message"
 msgstr "�交说明"
 
-#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
-#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
+#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
 msgid "commit"
 msgstr "�交"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1421
 msgid "reuse and edit message from specified commit"
 msgstr "�用并编辑指定�交的�交说明"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1422
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交说明"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1423
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "使用 autosquash 格�的�交说明用以修正指定的�交"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1424
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格�的�交说明用以压缩至指定的�交"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1425
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该�交的作者改为我（和 -C/-c/--amend �数共用）"
 
-#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
 #: builtin/pull.c:149 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "添加 Signed-off-by: 签�"
 
-#: builtin/commit.c:1632
+#: builtin/commit.c:1427
 msgid "use specified template file"
 msgstr "使用指定的模�文件"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1428
 msgid "force edit of commit"
 msgstr "强制编辑�交"
 
 #  译者：�选值，�能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1634
+#: builtin/commit.c:1429
 msgid "default"
 msgstr "default"
 
-#: builtin/commit.c:1634 builtin/tag.c:391
+#: builtin/commit.c:1429 builtin/tag.c:397
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除�交说明里的空格和#注释"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1430
 msgid "include status in commit message template"
 msgstr "在�交说明模�里包�状�信�"
 
-#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG �交签�"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1435
 msgid "Commit contents options"
 msgstr "�交内容选项"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1436
 msgid "commit all changed files"
 msgstr "�交所有改动的文件"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1437
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待�交"
 
-#: builtin/commit.c:1643
+#: builtin/commit.c:1438
 msgid "interactively add files"
 msgstr "交互�添加文件"
 
-#: builtin/commit.c:1644
+#: builtin/commit.c:1439
 msgid "interactively add changes"
 msgstr "交互�添加�更"
 
-#: builtin/commit.c:1645
+#: builtin/commit.c:1440
 msgid "commit only specified files"
 msgstr "��交指定的文件"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1441
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩�"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1442
 msgid "show what would be committed"
 msgstr "显示将��交的内容"
 
-#: builtin/commit.c:1658
+#: builtin/commit.c:1455
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1456
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩�"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1461
 msgid "ok to record an empty change"
 msgstr "�许一个空�交"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1463
 msgid "ok to record a change with an empty message"
 msgstr "�许空的�交说明"
 
-#: builtin/commit.c:1696
-msgid "could not parse HEAD commit"
-msgstr "�能解� HEAD �交"
-
-#: builtin/commit.c:1741
+#: builtin/commit.c:1536
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1748
+#: builtin/commit.c:1543
 msgid "could not read MERGE_MODE"
 msgstr "�能读� MERGE_MODE"
 
-#: builtin/commit.c:1767
+#: builtin/commit.c:1562
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能读��交说明：%s"
 
-#: builtin/commit.c:1778
+#: builtin/commit.c:1573
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止�交因为�交说明为空。\n"
 
-#: builtin/commit.c:1783
+#: builtin/commit.c:1578
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止�交；您未更改�自模版的�交说明。\n"
 
-#: builtin/commit.c:1831
+#: builtin/commit.c:1613
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7881,22 +8062,22 @@ msgstr "附注标签 %s 没有嵌入�称"
 msgid "tag '%s' is really '%s' here"
 msgstr "标签 '%s' 的确是在 '%s'"
 
-#: builtin/describe.c:314
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹� '%s'"
 
-#: builtin/describe.c:316
+#: builtin/describe.c:319
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "没有精确匹�到引用或标签，继续�索进行�述\n"
 
-#: builtin/describe.c:363
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完��索 %s\n"
 
-#: builtin/describe.c:389
+#: builtin/describe.c:392
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7905,7 +8086,7 @@ msgstr ""
 "没有附注标签能�述 '%s'。\n"
 "然而，存在未附注标签：�试 --tags。"
 
-#: builtin/describe.c:393
+#: builtin/describe.c:396
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7914,12 +8095,12 @@ msgstr ""
 "没有标签能�述 '%s'。\n"
 "�试 --always，或者创建一些标签。"
 
-#: builtin/describe.c:423
+#: builtin/describe.c:426
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已�历 %lu 个�交\n"
 
-#: builtin/describe.c:426
+#: builtin/describe.c:429
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7928,90 +8109,90 @@ msgstr ""
 "�现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃�索\n"
 
-#: builtin/describe.c:494
+#: builtin/describe.c:497
 #, c-format
 msgid "describe %s\n"
 msgstr "�述 %s\n"
 
-#: builtin/describe.c:497 builtin/log.c:500
+#: builtin/describe.c:500 builtin/log.c:502
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�是一个有效的对象� %s"
 
-#: builtin/describe.c:505
+#: builtin/describe.c:508
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s 既�是�交也�是数�对象"
 
-#: builtin/describe.c:519
+#: builtin/describe.c:522
 msgid "find the tag that comes after the commit"
 msgstr "寻找该�交之�的标签"
 
-#: builtin/describe.c:520
+#: builtin/describe.c:523
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试�索策略"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:524
 msgid "use any ref"
 msgstr "使用任�引用"
 
-#: builtin/describe.c:522
+#: builtin/describe.c:525
 msgid "use any tag, even unannotated"
 msgstr "使用任�标签，�使未附带注释"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:526
 msgid "always use long format"
 msgstr "始终使用长�交�格�"
 
-#: builtin/describe.c:524
+#: builtin/describe.c:527
 msgid "only follow first parent"
 msgstr "�跟�第一个父�交"
 
-#: builtin/describe.c:527
+#: builtin/describe.c:530
 msgid "only output exact matches"
 msgstr "�输出精确匹�"
 
-#: builtin/describe.c:529
+#: builtin/describe.c:532
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c:531
+#: builtin/describe.c:534
 msgid "only consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:533
+#: builtin/describe.c:536
 msgid "do not consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:535 builtin/name-rev.c:406
+#: builtin/describe.c:538 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的�交�作为�备"
 
-#: builtin/describe.c:536 builtin/describe.c:539
+#: builtin/describe.c:539 builtin/describe.c:542
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:540
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于�工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:543
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于��的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:561
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 与 --abbrev=0 �兼容"
 
-#: builtin/describe.c:587
+#: builtin/describe.c:590
 msgid "No names found, cannot describe anything."
 msgstr "没有�现�称，无法�述任何东西。"
 
-#: builtin/describe.c:637
+#: builtin/describe.c:640
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 与�交��兼容"
 
-#: builtin/describe.c:639
+#: builtin/describe.c:642
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 与�交��兼容"
 
@@ -8196,184 +8377,188 @@ msgstr "对导出的引用应用引用规格"
 msgid "anonymize output"
 msgstr "匿�输出"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:113 builtin/pull.c:188
+#: builtin/fetch.c:124 builtin/pull.c:188
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓�"
 
-#: builtin/fetch.c:115 builtin/pull.c:191
+#: builtin/fetch.c:126 builtin/pull.c:191
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而�是覆盖它"
 
-#: builtin/fetch.c:117 builtin/pull.c:194
+#: builtin/fetch.c:128 builtin/pull.c:194
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:118 builtin/pull.c:196
+#: builtin/fetch.c:129 builtin/pull.c:196
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:131
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓�"
 
-#: builtin/fetch.c:122 builtin/pull.c:198
+#: builtin/fetch.c:133 builtin/pull.c:198
 msgid "fetch all tags and associated objects"
 msgstr "抓�所有的标签和关�对象"
 
-#: builtin/fetch.c:124
+#: builtin/fetch.c:135
 msgid "do not fetch all tags (--no-tags)"
 msgstr "�抓�任何标签(--no-tags)"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:137
 msgid "number of submodules fetched in parallel"
 msgstr "�模组获�的并�数"
 
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:139 builtin/pull.c:201
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已��存在的分支的跟踪分支"
 
+#: builtin/fetch.c:141
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "清除远程�存在的本地标签，并且替��更标签"
+
 #  译者：�选值，�能翻译
-#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:143
 msgid "control recursive fetching of submodules"
 msgstr "控制�模组的递归抓�"
 
-#: builtin/fetch.c:134 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:209
 msgid "keep downloaded pack"
 msgstr "��下载包"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:149
 msgid "allow updating of HEAD ref"
 msgstr "�许更新 HEAD 引用"
 
-#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历�"
 
-#: builtin/fetch.c:141
+#: builtin/fetch.c:154
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间�深化浅克隆的历�"
 
-#: builtin/fetch.c:147 builtin/pull.c:215
+#: builtin/fetch.c:160 builtin/pull.c:215
 msgid "convert to a complete repository"
 msgstr "转�为一个完整的仓库"
 
-#: builtin/fetch.c:149 builtin/log.c:1463
+#: builtin/fetch.c:162 builtin/log.c:1466
 msgid "dir"
 msgstr "目录"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:163
 msgid "prepend this to submodule path output"
 msgstr "在�模组路径输出的��加上此目录"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:166
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获��模组的缺�值（比�置文件优先级低）"
 
-#: builtin/fetch.c:157 builtin/pull.c:218
+#: builtin/fetch.c:170 builtin/pull.c:218
 msgid "accept refs that update .git/shallow"
 msgstr "接�更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:158 builtin/pull.c:220
+#: builtin/fetch.c:171 builtin/pull.c:220
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:159 builtin/pull.c:221
+#: builtin/fetch.c:172 builtin/pull.c:221
 msgid "specify fetch refmap"
 msgstr "指定获��作的引用映射"
 
-#: builtin/fetch.c:417
+#: builtin/fetch.c:431
 msgid "Couldn't find remote ref HEAD"
 msgstr "无法�现远程 HEAD 引用"
 
-#: builtin/fetch.c:535
+#: builtin/fetch.c:549
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "�置�� fetch.output 包�无效值 %s"
 
-#: builtin/fetch.c:628
+#: builtin/fetch.c:642
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未�现"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:646
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:645 builtin/fetch.c:725
+#: builtin/fetch.c:659 builtin/fetch.c:739
 msgid "[rejected]"
 msgstr "[已拒�]"
 
-#: builtin/fetch.c:646
+#: builtin/fetch.c:660
 msgid "can't fetch in current branch"
 msgstr "当�分支下�能执行获��作"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:669
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
-#: builtin/fetch.c:720
+#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
+#: builtin/fetch.c:734
 msgid "unable to update local ref"
 msgstr "�能更新本地引用"
 
-#: builtin/fetch.c:675
+#: builtin/fetch.c:689
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:678
+#: builtin/fetch.c:692
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:681
+#: builtin/fetch.c:695
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:720
+#: builtin/fetch.c:734
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:725
+#: builtin/fetch.c:739
 msgid "non-fast-forward"
 msgstr "�快进"
 
-#: builtin/fetch.c:770
+#: builtin/fetch.c:784
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未��所有必须的对象\n"
 
-#: builtin/fetch.c:790
+#: builtin/fetch.c:804
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "拒� %s 因为浅克隆��许被更新"
 
-#: builtin/fetch.c:878 builtin/fetch.c:974
+#: builtin/fetch.c:892 builtin/fetch.c:988
 #, c-format
 msgid "From %.*s\n"
 msgstr "�自 %.*s\n"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:903
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8383,90 +8568,95 @@ msgstr ""
 " 'git remote prune %s' �删除旧的�有冲�的分支"
 
 #  译者：注����导空格
-#: builtin/fetch.c:944
+#: builtin/fetch.c:958
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将�为摇摆状�）"
 
 #  译者：注����导空格
-#: builtin/fetch.c:945
+#: builtin/fetch.c:959
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�为摇摆状�）"
 
-#: builtin/fetch.c:977
+#: builtin/fetch.c:991
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:978 builtin/remote.c:1024
+#: builtin/fetch.c:992 builtin/remote.c:1024
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1015
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "拒�获�到�纯仓库的当�分支 %s"
 
-#: builtin/fetch.c:1020
+#: builtin/fetch.c:1034
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c:1023
+#: builtin/fetch.c:1037
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1277
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获� %s\n"
 
-#: builtin/fetch.c:1258 builtin/remote.c:97
+#: builtin/fetch.c:1279 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "�能获� %s"
 
-#: builtin/fetch.c:1276
+#: builtin/fetch.c:1325 builtin/fetch.c:1498
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr "��以将 --filter 用于在 core.partialClone 中�置的远程仓库"
+
+#: builtin/fetch.c:1350
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库�指定，用以获�新�交。"
 
-#: builtin/fetch.c:1299
+#: builtin/fetch.c:1394
 msgid "You need to specify a tag name."
 msgstr "您需�指定一个标签�称。"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1439
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen �支�负数深度"
 
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1441
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen 和 --depth 是互斥的"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1446
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth 和 --unshallow �能�时使用"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1448
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，�数 --unshallow 没有�义"
 
-#: builtin/fetch.c:1364
+#: builtin/fetch.c:1464
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能带一个仓库�数"
 
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1466
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何�义"
 
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1475
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:1385
+#: builtin/fetch.c:1482
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "获�组并指定引用规格没有�义"
 
@@ -8531,7 +8721,7 @@ msgstr "引用��符适用于 Tcl"
 msgid "show only <n> matched refs"
 msgstr "�显示 <n> 个匹�的引用"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:414
+#: builtin/for-each-ref.c:39 builtin/tag.c:420
 msgid "respect format colors"
 msgstr "�照格�中的颜色输出"
 
@@ -8555,63 +8745,63 @@ msgstr "�打�包�该�交的引用"
 msgid "print only refs which don't contain the commit"
 msgstr "�打��包�该�交的引用"
 
-#: builtin/fsck.c:543
+#: builtin/fsck.c:568
 msgid "Checking object directories"
 msgstr "检查对象目录中"
 
-#: builtin/fsck.c:635
+#: builtin/fsck.c:660
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:641
+#: builtin/fsck.c:666
 msgid "show unreachable objects"
 msgstr "显示��达的对象"
 
-#: builtin/fsck.c:642
+#: builtin/fsck.c:667
 msgid "show dangling objects"
 msgstr "显示摇摆的对象"
 
-#: builtin/fsck.c:643
+#: builtin/fsck.c:668
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:669
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:645
+#: builtin/fsck.c:670
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:671
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:672
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:648
+#: builtin/fsck.c:673
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:649
+#: builtin/fsck.c:674
 msgid "enable more strict checking"
 msgstr "�用更严格的检查"
 
-#: builtin/fsck.c:651
+#: builtin/fsck.c:676
 msgid "write dangling objects in .git/lost-found"
 msgstr "将摇摆对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:652 builtin/prune.c:107
+#: builtin/fsck.c:677 builtin/prune.c:108
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:678
 msgid "show verbose names for reachable objects"
 msgstr "显示�达对象的详细�称"
 
-#: builtin/fsck.c:714
+#: builtin/fsck.c:742
 msgid "Checking objects"
 msgstr "检查对象中"
 
@@ -8655,38 +8845,38 @@ msgstr "更彻底（增加�行时间）"
 msgid "enable auto-gc mode"
 msgstr "�用自动垃圾回收模�"
 
-#: builtin/gc.c:364
+#: builtin/gc.c:366
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc �使�外一个 gc 正在执行"
 
-#: builtin/gc.c:381
+#: builtin/gc.c:384
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "无法解� gc.logexpiry 的值 %s"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:412
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在��执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:414
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c:412
+#: builtin/gc.c:415
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护�� \"git help gc\"。\n"
 
-#: builtin/gc.c:437
+#: builtin/gc.c:440
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "已�有一个 gc 正�行在机器 '%s' pid %<PRIuMAX>（如果�是，使用 --force）"
 
-#: builtin/gc.c:481
+#: builtin/gc.c:487
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多��达的�散对象，�行 'git prune' 删除它们。"
@@ -8695,12 +8885,12 @@ msgstr "有太多��达的�散对象，�行 'git prune' 删除它们。"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模�> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c:226
+#: builtin/grep.c:225
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c:284
+#: builtin/grep.c:283
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -8709,246 +8899,246 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支�，忽略 %s"
 
-#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读�树（%s）"
 
-#: builtin/grep.c:630
+#: builtin/grep.c:637
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓��自于 %s 类型的对象"
 
-#: builtin/grep.c:696
+#: builtin/grep.c:703
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:783
+#: builtin/grep.c:790
 msgid "search in index instead of in the work tree"
 msgstr "在索引区�索而�是在工作区"
 
-#: builtin/grep.c:785
+#: builtin/grep.c:792
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管�的内容中查找"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/grep.c:787
+#: builtin/grep.c:794
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中�索"
 
-#: builtin/grep.c:789
+#: builtin/grep.c:796
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包�的文件"
 
-#: builtin/grep.c:791
+#: builtin/grep.c:798
 msgid "recursively search in each submodule"
 msgstr "在�一个�模组中递归�索"
 
-#: builtin/grep.c:794
+#: builtin/grep.c:801
 msgid "show non-matching lines"
 msgstr "显示未匹�的行"
 
-#: builtin/grep.c:796
+#: builtin/grep.c:803
 msgid "case insensitive matching"
 msgstr "�区分大�写匹�"
 
-#: builtin/grep.c:798
+#: builtin/grep.c:805
 msgid "match patterns only at word boundaries"
 msgstr "�在��边界匹�模�"
 
-#: builtin/grep.c:800
+#: builtin/grep.c:807
 msgid "process binary files as text"
 msgstr "把二进制文件当�文本处�"
 
-#: builtin/grep.c:802
+#: builtin/grep.c:809
 msgid "don't match patterns in binary files"
 msgstr "�在二进制文件中匹�模�"
 
-#: builtin/grep.c:805
+#: builtin/grep.c:812
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处�二进制文件"
 
-#: builtin/grep.c:807
+#: builtin/grep.c:814
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度�下寻找"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:818
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达�"
 
-#: builtin/grep.c:814
+#: builtin/grep.c:821
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达�（默认）"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:824
 msgid "interpret patterns as fixed strings"
 msgstr "把模�解�为固定的字符串"
 
-#: builtin/grep.c:820
+#: builtin/grep.c:827
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达�"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:830
 msgid "show line numbers"
 msgstr "显示行�"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:831
 msgid "don't show filenames"
 msgstr "�显示文件�"
 
-#: builtin/grep.c:825
+#: builtin/grep.c:832
 msgid "show filenames"
 msgstr "显示文件�"
 
-#: builtin/grep.c:827
+#: builtin/grep.c:834
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:836
 msgid "show only filenames instead of matching lines"
 msgstr "�显示文件�而�显示匹�的行"
 
-#: builtin/grep.c:831
+#: builtin/grep.c:838
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches �义"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:841
 msgid "show only the names of files without match"
 msgstr "�显示未匹�的文件�"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:843
 msgid "print NUL after filenames"
 msgstr "在文件��输出 NUL 字符"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:846
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹�行数，而�显示匹�的行"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:847
 msgid "highlight matches"
 msgstr "高亮显示匹�项"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "print empty line between matches from different files"
 msgstr "在��文件的匹�项之间打�空行"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:851
 msgid "show filename only once above matches from same file"
 msgstr "�在�一文件的匹�项的上�显示一次文件�"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:854
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹�项��的 <n> 行上下文"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:857
 msgid "show <n> context lines before matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "show <n> context lines after matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:861
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "shortcut for -C NUM"
 msgstr "快�键 -C 数字"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show a line with the function name before matches"
 msgstr "在匹�的��显示一行函数�"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "show the surrounding function"
 msgstr "显示所在函数的��内容"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "read patterns from file"
 msgstr "从文件读�模�"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "match <pattern>"
 msgstr "匹� <模�>"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "combine patterns specified with -e"
 msgstr "组�用 -e �数设定的模�"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:886
 msgid "indicate hit with exit status without output"
 msgstr "�输出，而用退出�标识命中状�"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:888
 msgid "show only matches from files that match all patterns"
 msgstr "�显示匹�所有模�的文件中的匹�"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:890
 msgid "show parse tree for grep expression"
 msgstr "显示 grep 表达�的解�树"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:894
 msgid "show matching files in the pager"
 msgstr "分页显示匹�的文件"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "�许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:952
+#: builtin/grep.c:962
 msgid "no pattern given."
 msgstr "未�供模�匹�。"
 
-#: builtin/grep.c:984
+#: builtin/grep.c:994
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked �能和版本�时使用"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1001
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "�能解�版本：%s"
 
-#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#: builtin/grep.c:1036 builtin/index-pack.c:1519
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1041
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支�，忽略 --threads"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:1065
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
 msgid "option not supported with --recurse-submodules."
 msgstr "选项�支�和 --recurse-submodules 共用。"
 
-#: builtin/grep.c:1084
+#: builtin/grep.c:1094
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached 或 --untracked �能与 --no-index �时使用。"
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1100
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard �能用于已跟踪内容。"
 
-#: builtin/grep.c:1098
+#: builtin/grep.c:1108
 msgid "both --cached and trees are given."
 msgstr "�时给出了 --cached 和树对象。"
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8956,36 +9146,36 @@ msgstr ""
 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
 "[--] <文件>..."
 
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "type"
 msgstr "类型"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "对象类型"
 
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "将对象写入对象数�库"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "从标准输入读�对象"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "原样存储文件�使用过滤器"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "�许对任��机垃圾数��散列�创建��的对象以便调试 Git"
 
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "处�文件并�设其�自于此路径"
 
@@ -9117,152 +9307,152 @@ msgstr "'%s' 是 '%s' 的别�"
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/index-pack.c:156
+#: builtin/index-pack.c:157
 #, c-format
 msgid "unable to open %s"
 msgstr "�能打开 %s"
 
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:207
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型�匹�"
 
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获�预期的对象 %s"
 
-#: builtin/index-pack.c:229
+#: builtin/index-pack.c:230
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，�是 %s"
 
-#: builtin/index-pack.c:271
+#: builtin/index-pack.c:272
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "early EOF"
 msgstr "过早的文件结�符（EOF）"
 
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 msgid "used more bytes than were available"
 msgstr "用掉了超过�用的字节"
 
-#: builtin/index-pack.c:301
+#: builtin/index-pack.c:302
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当� off_t 的定义"
 
-#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大�许值"
 
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:320
 #, c-format
 msgid "unable to create '%s'"
 msgstr "�能创建 '%s'"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "无法打开包文件 '%s'"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 msgid "pack signature mismatch"
 msgstr "包签��匹�"
 
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:342
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "�支�包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:359
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象�于�移� %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:480
+#: builtin/index-pack.c:481
 #, c-format
 msgid "inflate returned %d"
 msgstr "解压缩返回 %d"
 
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
 msgid "offset value overflow for delta base object"
 msgstr "�移值覆盖了 delta 基准对象"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
 msgid "delta base offset is out of bound"
 msgstr "delta 基准�移越界"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知对象类型 %d"
 
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
 msgid "cannot pread pack file"
 msgstr "无法读�包文件"
 
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:579
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "包文件过早结�，缺少 %<PRIuMAX> 字节"
 msgstr[1] "包文件过早结�，缺少 %<PRIuMAX> 字节"
 
-#: builtin/index-pack.c:604
+#: builtin/index-pack.c:605
 msgid "serious inflate inconsistency"
 msgstr "解压缩严�的�一致"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
+#: builtin/index-pack.c:818 builtin/index-pack.c:827
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "�现 %s 出现 SHA1 冲��"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:179
-#: builtin/pack-objects.c:273
+#: builtin/index-pack.c:753 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:276
 #, c-format
 msgid "unable to read %s"
 msgstr "�能读 %s"
 
-#: builtin/index-pack.c:815
+#: builtin/index-pack.c:816
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�能读�现存对象信� %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�能读�现存对象 %s"
 
-#: builtin/index-pack.c:837
+#: builtin/index-pack.c:838
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数�对象 %s"
 
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:853
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 msgid "Error in object"
 msgstr "对象中出错"
 
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有�对象并�都�达"
 
-#: builtin/index-pack.c:929 builtin/index-pack.c:960
+#: builtin/index-pack.c:930 builtin/index-pack.c:961
 msgid "failed to apply delta"
 msgstr "无法应用 delta"
 
@@ -9332,77 +9522,81 @@ msgstr "�能压缩附加对象（%d）"
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已��"
 
-#: builtin/index-pack.c:1409
-msgid "error while closing pack file"
-msgstr "关闭包文件时出错"
+#: builtin/index-pack.c:1397
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "包文件� '%s' 没有以 '.pack' 结尾"
 
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1422
 #, c-format
-msgid "cannot write keep file '%s'"
-msgstr "无法写�留文件 '%s'"
+msgid "cannot write %s file '%s'"
+msgstr "无法写入 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1429
+#: builtin/index-pack.c:1430
 #, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "无法关闭�留文件 '%s'"
+msgid "cannot close written %s file '%s'"
+msgstr "无法关闭已写入的 %s 文件 '%s'"
+
+#: builtin/index-pack.c:1454
+msgid "error while closing pack file"
+msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1468
 msgid "cannot store pack file"
 msgstr "无法存储包文件"
 
-#: builtin/index-pack.c:1447
+#: builtin/index-pack.c:1476
 msgid "cannot store index file"
 msgstr "无法存储索引文件"
 
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1513
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "�的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1553
+#: builtin/index-pack.c:1581
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1583
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "� delta：%d 个对象"
 msgstr[1] "� delta：%d 个对象"
 
-#: builtin/index-pack.c:1610
+#: builtin/index-pack.c:1638
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "链长 = %d: %lu 对象"
 msgstr[1] "链长 = %d: %lu 对象"
 
-#: builtin/index-pack.c:1623
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包文件� '%s' 没有以 '.pack' 结尾"
+#: builtin/index-pack.c:1675
+msgid "Cannot come back to cwd"
+msgstr "无法返回当�工作目录"
 
-#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
-#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1763
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin �能和 --stdin �时使用"
 
-#: builtin/index-pack.c:1741
+#: builtin/index-pack.c:1765
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需�一个 git 仓库"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1771
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有�供包文件��数"
 
@@ -9584,120 +9778,120 @@ msgstr "--trailer 和 --only-input �时使用没有�义"
 msgid "no input file given for in-place editing"
 msgstr "没有给出�原�编辑的文件"
 
-#: builtin/log.c:46
+#: builtin/log.c:48
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c:47
+#: builtin/log.c:49
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c:91
+#: builtin/log.c:93
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c:151
+#: builtin/log.c:153
 msgid "suppress diff output"
 msgstr "�显示差异输出"
 
-#: builtin/log.c:152
+#: builtin/log.c:154
 msgid "show source"
 msgstr "显示�"
 
-#: builtin/log.c:153
+#: builtin/log.c:155
 msgid "Use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:155
+#: builtin/log.c:157
 msgid "only decorate refs that match <pattern>"
 msgstr "�修饰与 <模�> 匹�的引用"
 
-#: builtin/log.c:157
+#: builtin/log.c:159
 msgid "do not decorate refs that match <pattern>"
 msgstr "�修饰和 <模�> 匹�的引用"
 
-#: builtin/log.c:158
+#: builtin/log.c:160
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:161
+#: builtin/log.c:163
 msgid "Process line range n,m in file, counting from 1"
 msgstr "处�文件中第 n 到 m 之间的行，从 1 开始"
 
-#: builtin/log.c:257
+#: builtin/log.c:259
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:508
+#: builtin/log.c:510
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ��的文件"
 
-#: builtin/log.c:523 builtin/log.c:617
+#: builtin/log.c:525 builtin/log.c:619
 #, c-format
 msgid "Could not read object %s"
 msgstr "�能读�对象 %s"
 
-#: builtin/log.c:641
+#: builtin/log.c:643
 #, c-format
 msgid "Unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:762
+#: builtin/log.c:764
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:863
+#: builtin/log.c:865
 msgid "name of output directory is too long"
 msgstr "输出目录�太长"
 
-#: builtin/log.c:879
+#: builtin/log.c:881
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "无法打开补�文件 %s"
 
-#: builtin/log.c:896
+#: builtin/log.c:898
 msgid "Need exactly one range."
 msgstr "�需�一个范围。"
 
-#: builtin/log.c:906
+#: builtin/log.c:908
 msgid "Not a range."
 msgstr "�是一个范围。"
 
-#: builtin/log.c:1012
+#: builtin/log.c:1014
 msgid "Cover letter needs email format"
 msgstr "信�需�邮件地�格�"
 
-#: builtin/log.c:1092
+#: builtin/log.c:1095
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1119
+#: builtin/log.c:1122
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1169
+#: builtin/log.c:1172
 msgid "Two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
 #, c-format
 msgid "Unknown commit %s"
 msgstr "未知�交 %s"
 
-#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解� '%s' 为一个有效引用。"
 
-#: builtin/log.c:1291
+#: builtin/log.c:1294
 msgid "Could not find exact merge base."
 msgstr "�能找到准确的�并基线。"
 
-#: builtin/log.c:1295
+#: builtin/log.c:1298
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9707,226 +9901,226 @@ msgstr ""
 "git branch --set-upstream-to �跟踪一个远程分支。或者你�以通过\n"
 "�数 --base=<基线�交> 手动指定一个基线�交。"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 msgstr "无法找到准确的�并基线"
 
-#: builtin/log.c:1326
+#: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线�交应该是版本列表的祖先"
 
-#: builtin/log.c:1330
+#: builtin/log.c:1333
 msgid "base commit shouldn't be in revision list"
 msgstr "基线�交�应该出现在版本列表中"
 
-#: builtin/log.c:1379
+#: builtin/log.c:1382
 msgid "cannot get patch id"
 msgstr "无法得到补� id"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1441
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一个补�"
 
-#: builtin/log.c:1441
+#: builtin/log.c:1444
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多个补�"
 
-#: builtin/log.c:1445
+#: builtin/log.c:1448
 msgid "print patches to standard out"
 msgstr "打�补�到标准输出"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1450
 msgid "generate a cover letter"
 msgstr "生�一�附信"
 
-#: builtin/log.c:1449
+#: builtin/log.c:1452
 msgid "use simple number sequence for output file names"
 msgstr "使用简�的数字�列作为输出文件�"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1453
 msgid "sfx"
 msgstr "�缀"
 
-#: builtin/log.c:1451
+#: builtin/log.c:1454
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <�缀> 代替 '.patch'"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1456
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补�以 <n> 开始编�，而�是1"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1458
 msgid "mark the series as Nth re-roll"
 msgstr "标记补�系列是第几次�制"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1460
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1463
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1466
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1469
 msgid "don't strip/add [PATCH]"
 msgstr "�删除/添加 [PATCH]"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1472
 msgid "don't output binary diffs"
 msgstr "�输出二进制差异"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1474
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信�中输出全为零的哈希值"
 
-#: builtin/log.c:1473
+#: builtin/log.c:1476
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的补�"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1478
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补�格�而�默认的（补�+状�）"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1480
 msgid "Messaging"
 msgstr "邮件��"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1481
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1482
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1480 builtin/log.c:1482
+#: builtin/log.c:1483 builtin/log.c:1485
 msgid "email"
 msgstr "邮件地�"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1483
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1485
 msgid "add Cc: header"
 msgstr "添加抄�"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1487
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1485
+#: builtin/log.c:1488
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地�设置为 <标识>（如若��供，则用�交者 ID �为地�）"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1490
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1491
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�邮件作为对 <邮件标识> 的回�"
 
-#: builtin/log.c:1489 builtin/log.c:1492
+#: builtin/log.c:1492 builtin/log.c:1495
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1490
+#: builtin/log.c:1493
 msgid "attach the patch"
 msgstr "附件方�添加补�"
 
-#: builtin/log.c:1493
+#: builtin/log.c:1496
 msgid "inline the patch"
 msgstr "内�显示补�"
 
-#: builtin/log.c:1497
+#: builtin/log.c:1500
 msgid "enable message threading, styles: shallow, deep"
 msgstr "�用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1499
+#: builtin/log.c:1502
 msgid "signature"
 msgstr "签�"
 
-#: builtin/log.c:1500
+#: builtin/log.c:1503
 msgid "add a signature"
 msgstr "添加一个签�"
 
-#: builtin/log.c:1501
+#: builtin/log.c:1504
 msgid "base-commit"
 msgstr "基线�交"
 
-#: builtin/log.c:1502
+#: builtin/log.c:1505
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补�列表添加�置树信�"
 
-#: builtin/log.c:1504
+#: builtin/log.c:1507
 msgid "add a signature from a file"
 msgstr "从文件添加一个签�"
 
-#: builtin/log.c:1505
+#: builtin/log.c:1508
 msgid "don't print the patch filenames"
 msgstr "��打�补�文件�"
 
-#: builtin/log.c:1507
+#: builtin/log.c:1510
 msgid "show progress while generating patches"
 msgstr "在生�补�时显示进度"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1585
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�无效的身份标识：%s"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1600
 msgid "-n and -k are mutually exclusive."
 msgstr "-n 和 -k 互斥。"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1602
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1610
 msgid "--name-only does not make sense"
 msgstr "--name-only 无�义"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1612
 msgid "--name-status does not make sense"
 msgstr "--name-status 无�义"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1614
 msgid "--check does not make sense"
 msgstr "--check 无�义"
 
-#: builtin/log.c:1641
+#: builtin/log.c:1646
 msgid "standard output, or directory, which one?"
 msgstr "标准输出或目录，哪一个？"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1648
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1741
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读�签�文件 '%s'"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1773
 msgid "Generating patches"
 msgstr "生�补�"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1817
 msgid "Failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:1862
+#: builtin/log.c:1867
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<�制>]]]"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1921
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -10078,7 +10272,7 @@ msgstr "�考 url.<base>.insteadOf 设置"
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "若未找到匹�的引用则以退出�2退出"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "除了显示指�的对象外，显示指�的引用�"
 
@@ -10123,181 +10317,181 @@ msgstr "列出整个树；�仅仅当�目录（�� --full-name）"
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<�交>...]"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:50
+#: builtin/merge.c:51
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:107
+#: builtin/merge.c:108
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需�一个值"
 
-#: builtin/merge.c:144
+#: builtin/merge.c:145
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�并策略 '%s'。\n"
 
-#: builtin/merge.c:145
+#: builtin/merge.c:146
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:150
+#: builtin/merge.c:151
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自定义策略有："
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:201 builtin/pull.c:137
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在�并的最��显示差异统计"
 
-#: builtin/merge.c:203 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "show a diffstat at the end of the merge"
 msgstr "在�并的最�显示差异统计"
 
-#: builtin/merge.c:204 builtin/pull.c:143
+#: builtin/merge.c:205 builtin/pull.c:143
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �义）"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:207 builtin/pull.c:146
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在�并�交信�中添加（最多 <n> �）精简�交记录"
 
-#: builtin/merge.c:209 builtin/pull.c:152
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个�独的�交而�是�一次�并"
 
-#: builtin/merge.c:211 builtin/pull.c:155
+#: builtin/merge.c:212 builtin/pull.c:155
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�并�功，执行一次�交（默认）"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:214 builtin/pull.c:158
 msgid "edit message before committing"
 msgstr "在�交�编辑�交说明"
 
-#: builtin/merge.c:214
+#: builtin/merge.c:215
 msgid "allow fast-forward (default)"
 msgstr "�许快进（默认）"
 
-#: builtin/merge.c:216 builtin/pull.c:164
+#: builtin/merge.c:217 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快进就放弃�并"
 
-#: builtin/merge.c:220 builtin/pull.c:167
+#: builtin/merge.c:221 builtin/pull.c:167
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "ç­–ç•¥"
 
-#: builtin/merge.c:222 builtin/pull.c:172
+#: builtin/merge.c:223 builtin/pull.c:172
 msgid "merge strategy to use"
 msgstr "�使用的�并策略"
 
-#: builtin/merge.c:223 builtin/pull.c:175
+#: builtin/merge.c:224 builtin/pull.c:175
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:224 builtin/pull.c:176
+#: builtin/merge.c:225 builtin/pull.c:176
 msgid "option for selected merge strategy"
 msgstr "所选的�并策略的选项"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�并的�交说明（针对�快进��并）"
 
-#: builtin/merge.c:230
+#: builtin/merge.c:231
 msgid "abort the current in-progress merge"
 msgstr "放弃当�正在进行的�并"
 
-#: builtin/merge.c:232
+#: builtin/merge.c:233
 msgid "continue the current in-progress merge"
 msgstr "继续当�正在进行的�并"
 
-#: builtin/merge.c:234 builtin/pull.c:183
+#: builtin/merge.c:235 builtin/pull.c:183
 msgid "allow merging unrelated histories"
 msgstr "�许�并�相关的历�"
 
-#: builtin/merge.c:240
+#: builtin/merge.c:241
 msgid "verify commit-msg hook"
 msgstr "校验 commit-msg 钩�"
 
-#: builtin/merge.c:265
+#: builtin/merge.c:266
 msgid "could not run stash."
 msgstr "�能�行贮�。"
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "stash failed"
 msgstr "贮�失败"
 
-#: builtin/merge.c:275
+#: builtin/merge.c:276
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一个有效对象：%s"
 
-#: builtin/merge.c:297 builtin/merge.c:314
+#: builtin/merge.c:298 builtin/merge.c:315
 msgid "read-tree failed"
 msgstr "读�树失败"
 
 #  译者：注����导空格
-#: builtin/merge.c:344
+#: builtin/merge.c:345
 msgid " (nothing to squash)"
 msgstr " （无�压缩）"
 
-#: builtin/merge.c:355
+#: builtin/merge.c:356
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "压缩�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:405
+#: builtin/merge.c:406
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无�并信� -- 未更新 HEAD\n"
 
-#: builtin/merge.c:455
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指�一个�交"
 
-#: builtin/merge.c:545
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:667
+#: builtin/merge.c:668
 msgid "Not handling anything other than two heads merge."
 msgstr "未处�两个头�并之外的任何�作。"
 
-#: builtin/merge.c:681
+#: builtin/merge.c:682
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive 的未知选项：-X%s"
 
-#: builtin/merge.c:696
+#: builtin/merge.c:697
 #, c-format
 msgid "unable to write %s"
 msgstr "�能写 %s"
 
-#: builtin/merge.c:748
+#: builtin/merge.c:749
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能从 '%s' 读�"
 
-#: builtin/merge.c:757
+#: builtin/merge.c:758
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未�交�并，使用 'git commit' 完�此次�并。\n"
 
-#: builtin/merge.c:763
+#: builtin/merge.c:764
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10311,68 +10505,68 @@ msgstr ""
 "\n"
 "以 '%c' 开头的行将被忽略，而且空�交说明将会终止�交。\n"
 
-#: builtin/merge.c:799
+#: builtin/merge.c:800
 msgid "Empty commit message."
 msgstr "空�交信�。"
 
-#: builtin/merge.c:819
+#: builtin/merge.c:820
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:872
+#: builtin/merge.c:873
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动�并失败，修正冲�然��交修正的结果。\n"
 
-#: builtin/merge.c:911
+#: builtin/merge.c:912
 msgid "No current branch."
 msgstr "没有当�分支。"
 
-#: builtin/merge.c:913
+#: builtin/merge.c:914
 msgid "No remote for the current branch."
 msgstr "当�分支没有对应的远程仓库。"
 
-#: builtin/merge.c:915
+#: builtin/merge.c:916
 msgid "No default upstream defined for the current branch."
 msgstr "当�分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:920
+#: builtin/merge.c:921
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有�自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:973
+#: builtin/merge.c:974
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在�的�值 '%1$s'"
 
-#: builtin/merge.c:1075
+#: builtin/merge.c:1076
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�并：%s"
 
-#: builtin/merge.c:1109
+#: builtin/merge.c:1110
 msgid "not something we can merge"
 msgstr "�能�并"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1212
 msgid "--abort expects no arguments"
 msgstr "--abort �带�数"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1216
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有�终止的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1190
+#: builtin/merge.c:1228
 msgid "--continue expects no arguments"
 msgstr "--continue �带�数"
 
-#: builtin/merge.c:1194
+#: builtin/merge.c:1232
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1210
+#: builtin/merge.c:1248
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10380,7 +10574,7 @@ msgstr ""
 "您尚未结�您的�并（存在 MERGE_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1217
+#: builtin/merge.c:1255
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10388,112 +10582,112 @@ msgstr ""
 "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1220
+#: builtin/merge.c:1258
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1229
+#: builtin/merge.c:1267
 msgid "You cannot combine --squash with --no-ff."
 msgstr "您�能将 --squash 与 --no-ff �时使用。"
 
-#: builtin/merge.c:1237
+#: builtin/merge.c:1275
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1254
+#: builtin/merge.c:1292
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的压缩�交"
 
-#: builtin/merge.c:1256
+#: builtin/merge.c:1294
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快进��交没有�义"
 
-#: builtin/merge.c:1261
+#: builtin/merge.c:1299
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�并"
 
-#: builtin/merge.c:1263
+#: builtin/merge.c:1301
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能将一个�交�并到空分支上"
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1335
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
 
-#: builtin/merge.c:1300
+#: builtin/merge.c:1338
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
 
-#: builtin/merge.c:1303
+#: builtin/merge.c:1341
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 没有一个 GPG 签�。"
 
-#: builtin/merge.c:1306
+#: builtin/merge.c:1344
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1403
 msgid "refusing to merge unrelated histories"
 msgstr "拒��并无关的历�"
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1412
 msgid "Already up to date."
 msgstr "已�是最新的。"
 
-#: builtin/merge.c:1387
+#: builtin/merge.c:1422
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1463
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�试�常�的索引内�并...\n"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1470
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1460
+#: builtin/merge.c:1495
 msgid "Already up to date. Yeeah!"
 msgstr "已�是最新的。耶�"
 
-#: builtin/merge.c:1466
+#: builtin/merge.c:1501
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: builtin/merge.c:1489 builtin/merge.c:1568
+#: builtin/merge.c:1524 builtin/merge.c:1603
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状�...\n"
 
-#: builtin/merge.c:1493
+#: builtin/merge.c:1528
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�试�并策略 %s...\n"
 
-#: builtin/merge.c:1559
+#: builtin/merge.c:1594
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有�并策略处�此�并。\n"
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1596
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �并失败。\n"
 
-#: builtin/merge.c:1570
+#: builtin/merge.c:1605
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "使用 %s 以准备手工解决。\n"
 
-#: builtin/merge.c:1582
+#: builtin/merge.c:1617
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动�并进展顺利，按�求在�交��止\n"
@@ -10647,72 +10841,72 @@ msgstr "%.*s 在索引中"
 msgid "force move/rename even if target exists"
 msgstr "强制移动/�命令，�使目标存在"
 
-#: builtin/mv.c:126
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "跳过移动/�命�错误"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' �是一个目录"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的�命�\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "�的�"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "�能将目录移动到自身"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "�能将目录移动到文件"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "�目录为空"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "�在版本控制之下"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "�能覆盖"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "�一目标具有多个�"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "目标目录�存在"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，�=%s，目标=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�命� %s 至 %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�命� '%s' 失败"
@@ -10901,12 +11095,12 @@ msgstr "�能写注解对象"
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:234 builtin/tag.c:500
+#: builtin/notes.c:234 builtin/tag.c:506
 #, c-format
 msgid "cannot read '%s'"
 msgstr "�能读� '%s'"
 
-#: builtin/notes.c:236 builtin/tag.c:503
+#: builtin/notes.c:236 builtin/tag.c:509
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能打开或读� '%s'"
@@ -11144,7 +11338,7 @@ msgstr "�试删除�存在的注解�是一个错误"
 msgid "read object names from the standard input"
 msgstr "从标准输入读�对象�称"
 
-#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
 msgid "do not remove, show only"
 msgstr "�删除，�显示"
 
@@ -11175,182 +11369,186 @@ msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <�缀�称> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:791
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "�用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:804
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1081
+#: builtin/pack-objects.c:1084
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "�用 bitmap 写入，因为一些对象将�会被打包"
 
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2454
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2625
 msgid "invalid value for --missing"
 msgstr "选项 --missing 的值无效"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2928
 #, c-format
 msgid "unsupported index version %s"
 msgstr "�支�的索引版本 %s"
 
-#: builtin/pack-objects.c:2906
+#: builtin/pack-objects.c:2932
 #, c-format
 msgid "bad index version '%s'"
 msgstr "�的索引版本 '%s'"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2962
 msgid "do not show progress meter"
 msgstr "�显示进度表"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2964
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2966
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/pack-objects.c:2943
+#: builtin/pack-objects.c:2969
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2970
 msgid "version[,offset]"
 msgstr "版本[,�移]"
 
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2971
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格�版本�写包索引文件"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2974
 msgid "maximum size of each output pack file"
 msgstr "�个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:2950
+#: builtin/pack-objects.c:2976
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:2952
+#: builtin/pack-objects.c:2978
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:2954
+#: builtin/pack-objects.c:2980
 msgid "limit pack window by objects"
 msgstr "�制打包窗�的对象数"
 
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2982
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数��制外设置打包窗�的内存�制"
 
-#: builtin/pack-objects.c:2958
+#: builtin/pack-objects.c:2984
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包�许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:2960
+#: builtin/pack-objects.c:2986
 msgid "reuse existing deltas"
 msgstr "�用已存在的 deltas"
 
-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:2988
 msgid "reuse existing objects"
 msgstr "�用已存在的对象"
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:2990
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:2992
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹�"
 
-#: builtin/pack-objects.c:2968
+#: builtin/pack-objects.c:2994
 msgid "do not create an empty pack output"
 msgstr "�创建空的包输出"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2996
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读�版本��数"
 
-#: builtin/pack-objects.c:2972
+#: builtin/pack-objects.c:2998
 msgid "limit the objects to those that are not yet packed"
 msgstr "�制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:2975
+#: builtin/pack-objects.c:3001
 msgid "include objects reachable from any reference"
 msgstr "包括�以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3004
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:2981
+#: builtin/pack-objects.c:3007
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3010
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3012
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3014
 msgid "keep unreachable objects"
 msgstr "维���达的对象"
 
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3016
 msgid "pack loose unreachable objects"
 msgstr "打包�散的��达对象"
 
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3018
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:2995
+#: builtin/pack-objects.c:3021
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:2997
+#: builtin/pack-objects.c:3023
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适�浅克隆仓库获�的包"
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3025
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略�有 .keep 文件的包"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3027
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3029
 msgid "do not hide commits by grafts"
 msgstr "显示被�接��的�交"
 
-#: builtin/pack-objects.c:3005
+#: builtin/pack-objects.c:3031
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的�）以�高对象计数时的速度"
 
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3033
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的�时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3036
 msgid "handling for missing objects"
 msgstr "处�丢失的对象"
 
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3039
+msgid "do not pack objects in promisor packfiles"
+msgstr "��打包 promisor 包文件中的对象"
+
+#: builtin/pack-objects.c:3178
 msgid "Counting objects"
 msgstr "对象计数中"
 
@@ -11378,15 +11576,19 @@ msgstr "正在删除��对象"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:107
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:110
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:112
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "�制�历 promisor 包以外的对象"
+
+#: builtin/prune.c:126
 msgid "cannot prune in a precious-objects repo"
 msgstr "�能在��仓库中执行清��作"
 
@@ -11480,7 +11682,7 @@ msgstr "详� git-pull(1)。"
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<分支>"
@@ -11503,27 +11705,27 @@ msgstr ""
 "您的�置中指定��并远程的引用 '%s'，\n"
 "但是没有获�到这个引用。"
 
-#: builtin/pull.c:817
+#: builtin/pull.c:819
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为�基�作忽略 --verify-signatures"
 
-#: builtin/pull.c:865
+#: builtin/pull.c:867
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash 选项�在使用 --rebase 时有效。"
 
-#: builtin/pull.c:873
+#: builtin/pull.c:875
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，�更添加至索引。"
 
-#: builtin/pull.c:876
+#: builtin/pull.c:878
 msgid "pull with rebase"
 msgstr "�基�拉�"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:879
 msgid "please commit or stash them."
 msgstr "请�交或贮�它们。"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:904
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11533,7 +11735,7 @@ msgstr ""
 "fetch 更新了当�的分支。快进您的工作区\n"
 "至�交 %s。"
 
-#: builtin/pull.c:907
+#: builtin/pull.c:909
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11550,15 +11752,15 @@ msgstr ""
 "$ git reset --hard\n"
 "��之�的状�。"
 
-#: builtin/pull.c:922
+#: builtin/pull.c:924
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支�并到空分支。"
 
-#: builtin/pull.c:926
+#: builtin/pull.c:928
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法�基到多个分支。"
 
-#: builtin/pull.c:933
+#: builtin/pull.c:935
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地�模组中有修改，无法�基"
 
@@ -11928,39 +12130,43 @@ msgstr "git rebase--helper [<选项>]"
 msgid "keep empty commits"
 msgstr "��空�交"
 
-#: builtin/rebase--helper.c:25
+#: builtin/rebase--helper.c:26 builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "�许�交说明为空"
+
+#: builtin/rebase--helper.c:27
 msgid "continue rebase"
 msgstr "继续�基"
 
-#: builtin/rebase--helper.c:27
+#: builtin/rebase--helper.c:29
 msgid "abort rebase"
 msgstr "中止�基"
 
-#: builtin/rebase--helper.c:30
+#: builtin/rebase--helper.c:32
 msgid "make rebase script"
 msgstr "制作�基脚本"
 
-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:34
 msgid "shorten commit ids in the todo list"
 msgstr "缩短待办列表中的�交�"
 
-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:36
 msgid "expand commit ids in the todo list"
 msgstr "扩展待办列表中的�交�"
 
-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:38
 msgid "check the todo list"
 msgstr "检查待办列表"
 
-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:40
 msgid "skip unnecessary picks"
 msgstr "跳过�必�的拣选"
 
-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:42
 msgid "rearrange fixup/squash lines"
 msgstr "�新排列 fixup/squash 行"
 
-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:44
 msgid "insert exec commands in todo list"
 msgstr "在待办列表中�入 exec 执行命令"
 
@@ -11968,7 +12174,7 @@ msgstr "在待办列表中�入 exec 执行命令"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c:840
+#: builtin/receive-pack.c:841
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11994,7 +12200,7 @@ msgstr ""
 "若��蔽此信�且��默认行为，设置 'receive.denyCurrentBranch'\n"
 "�置��为 'refuse'。"
 
-#: builtin/receive-pack.c:860
+#: builtin/receive-pack.c:861
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12013,15 +12219,15 @@ msgstr ""
 "\n"
 "若��蔽此信�，您�以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1934
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1948
 msgid "You must specify a directory."
 msgstr "您必须指定一个目录。"
 
-#: builtin/reflog.c:531 builtin/reflog.c:536
+#: builtin/reflog.c:532 builtin/reflog.c:537
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' �是一个有效的时间戳"
@@ -12542,87 +12748,87 @@ msgstr ""
 "增� repack 和 bitmap 索引�兼容。  使用 --no-write-bitmap-index\n"
 "或�用 pack.writebitmaps �置。"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:170
+#: builtin/repack.c:172
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相�，并将��达的对象设为�散对象"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，�行 git-prune-packed"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-delta"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-object"
 
-#: builtin/repack.c:179
+#: builtin/repack.c:181
 msgid "do not run git-update-server-info"
 msgstr "��行 git-update-server-info"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "pass --local to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --local"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:185
+#: builtin/repack.c:187
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，��将早于给定时间的对象过期"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，�新对��达对象打包"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "size of the window used for delta compression"
 msgstr "用于增�压缩的窗�值"
 
-#: builtin/repack.c:191 builtin/repack.c:197
+#: builtin/repack.c:193 builtin/repack.c:199
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上�的相似，但�制内存大�而��目数"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
 msgid "limits the maximum delta depth"
 msgstr "�制最大增�深度"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:198
 msgid "limits the maximum number of threads"
 msgstr "�制最大线程数"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:200
 msgid "maximum size of each packfile"
 msgstr "�个包文件的最大尺寸"
 
-#: builtin/repack.c:200
+#: builtin/repack.c:202
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象�新打包"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:212
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "�能删除��仓库中的打包文件"
 
-#: builtin/repack.c:214
+#: builtin/repack.c:216
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable 和 -A �兼容"
 
-#: builtin/repack.c:406 builtin/worktree.c:146
+#: builtin/repack.c:410 builtin/worktree.c:148
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "无法删除 '%s'"
@@ -12703,11 +12909,11 @@ msgstr "修改一个�交的父�交"
 msgid "replace the ref if it exists"
 msgstr "如果存在则替�引用"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "do not pretty-print contents for --edit"
 msgstr "��为 --edit �作美观显示内容"
 
-#: builtin/replace.c:444
+#: builtin/replace.c:445
 msgid "use this format"
 msgstr "使用此格�"
 
@@ -12765,102 +12971,106 @@ msgstr "无法找到 HEAD 指�的树。"
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指�的树。"
 
-#: builtin/reset.c:113
+#: builtin/reset.c:111
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在�于 %s"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:197
+#: builtin/reset.c:189
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�并过程中�能�%s�置�作。"
 
-#: builtin/reset.c:297
+#: builtin/reset.c:289
 msgid "be quiet, only report errors"
 msgstr "安�模�，�报告错误"
 
-#: builtin/reset.c:299
+#: builtin/reset.c:291
 msgid "reset HEAD and index"
 msgstr "�置 HEAD 和索引"
 
-#: builtin/reset.c:300
+#: builtin/reset.c:292
 msgid "reset only HEAD"
 msgstr "��置 HEAD"
 
-#: builtin/reset.c:302 builtin/reset.c:304
+#: builtin/reset.c:294 builtin/reset.c:296
 msgid "reset HEAD, index and working tree"
 msgstr "�置 HEAD�索引和工作区"
 
-#: builtin/reset.c:306
+#: builtin/reset.c:298
 msgid "reset HEAD but keep local changes"
 msgstr "�置 HEAD 但�存本地�更"
 
-#: builtin/reset.c:312
+#: builtin/reset.c:304
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为��添加"
 
-#: builtin/reset.c:329
+#: builtin/reset.c:321
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解�为一个有效的版本。"
 
-#: builtin/reset.c:337
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解�为一个有效的树对象。"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:338
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 与 --{hard�mixed�soft} 选项�兼容"
 
-#: builtin/reset.c:355
+#: builtin/reset.c:347
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:357
+#: builtin/reset.c:349
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能带路径进行%s�置。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:367
+#: builtin/reset.c:359
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能对纯仓库进行%s�置"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:363
 msgid "-N can only be used with --mixed"
 msgstr "-N �能和 --mixed �时使用"
 
-#: builtin/reset.c:388
+#: builtin/reset.c:380
 msgid "Unstaged changes after reset:"
 msgstr "�置��消暂存的�更："
 
-#: builtin/reset.c:394
+#: builtin/reset.c:386
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:390
 msgid "Could not write new index file."
 msgstr "�能写入新的索引文件。"
 
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:397
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "�能�时使用 --exclude-promisor-objects 和 --missing 选项"
+
+#: builtin/rev-list.c:455
 msgid "object filtering requires --objects"
 msgstr "对象过滤需� --objects"
 
-#: builtin/rev-list.c:402
+#: builtin/rev-list.c:458
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "无效的稀�值 '%s'"
 
-#: builtin/rev-list.c:442
+#: builtin/rev-list.c:499
 msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�显示注解"
 
-#: builtin/rev-list.c:445
+#: builtin/rev-list.c:502
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "�能将 --use-bitmap-index 和对象过滤组�使用"
 
@@ -12963,10 +13173,6 @@ msgstr "追加�交�称"
 msgid "preserve initially empty commits"
 msgstr "�留�始化的空�交"
 
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
-msgstr "�许�交说明为空"
-
 #: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "��多余的�空的�交"
@@ -13305,143 +13511,233 @@ msgstr "跳过和移除所有的注释行"
 msgid "prepend comment character and space to each line"
 msgstr "为�一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
+#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用�称，�得到 %s"
 
-#: builtin/submodule--helper.c:81
+#: builtin/submodule--helper.c:59
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote �带�数"
+
+#: builtin/submodule--helper.c:96
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
 
-#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:375
+#: builtin/submodule--helper.c:409
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到�模组 '%s' 的 url"
 
-#: builtin/submodule--helper.c:464
+#: builtin/submodule--helper.c:498
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "无法找到�置 '%s'。�定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:475
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "无法为�模组 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:479
+#: builtin/submodule--helper.c:513
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "�模组 '%s'（%s）未对路径 '%s' 注册\n"
 
 #
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议�模组 '%s' 使用命令更新模�\n"
 
-#: builtin/submodule--helper.c:496
+#: builtin/submodule--helper.c:530
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "无法为�模组 '%s' 注册更新模�"
 
-#: builtin/submodule--helper.c:518
+#: builtin/submodule--helper.c:552
 msgid "Suppress output for initializing a submodule"
-msgstr "�消�模组�始化的输出"
+msgstr "阻止�模组�始化的输出"
 
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:557
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<路径>]"
 
-#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有�现路径 '%s' 的�模组映射"
 
-#: builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:660
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "无法解��模组 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "无法递归�模组 '%s'"
 
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
 msgid "Suppress submodule status output"
-msgstr "�消�模组状�输出"
+msgstr "阻止�模组状�输出"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:712
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用存储在索引中的�交，而�存储在�模组 HEAD 中的�交"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:713
 msgid "recurse into nested submodules"
-msgstr "在嵌套�模组中递归"
+msgstr "递归进入嵌套�模组中"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:718
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:742
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#: builtin/submodule--helper.c:806
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "为 '%s' �步�模组 url\n"
+
+#: builtin/submodule--helper.c:812
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "无法为�模组路径 '%s' 注册 url"
+
+#: builtin/submodule--helper.c:826
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "无法得到�模组 '%s' 的默认远程关�"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "无法为�模组 '%s' 更新远程关�"
+
+#: builtin/submodule--helper.c:885
+msgid "Suppress output of synchronizing submodule url"
+msgstr "阻止�模组 url �步的输出"
+
+#: builtin/submodule--helper.c:887
+msgid "Recurse into nested submodules"
+msgstr "递归进入嵌套�模组中"
+
+#: builtin/submodule--helper.c:892
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
+
+#: builtin/submodule--helper.c:946
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+"�模组工作区 '%s' 包�一个 .git 目录（如果您确需删除它�其全部历�，使用 "
+"'rm -rf' 命令）"
+
+#: builtin/submodule--helper.c:958
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr "�模组工作区 '%s' 包�本地修改；使用 '-f' 丢弃它们"
+
+#: builtin/submodule--helper.c:966
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "已清除目录 '%s'\n"
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "无法移除�模组工作区 '%s'\n"
+
+#: builtin/submodule--helper.c:977
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "�能创建空的�模组目录 %s"
+
+#: builtin/submodule--helper.c:993
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "�模组 '%s'（%s）未对路径 '%s' 注册\n"
+
+#: builtin/submodule--helper.c:1022
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr "删除�模组工作区，�使包�本地修改"
+
+#: builtin/submodule--helper.c:1023
+msgid "Unregister all submodules"
+msgstr "将所有�模组�消注册"
+
+#: builtin/submodule--helper.c:1028
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
+
+#: builtin/submodule--helper.c:1042
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "如果您确实想�对所有�模组执行�消�始化，请使用 '--all'"
+
+#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "�模组 '%s' �能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:1172
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能识别 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:842
+#: builtin/submodule--helper.c:1179
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�能识别 submodule.alternateLocaion 的�值 '%s'"
 
-#: builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1201
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模组将�克隆的路径"
 
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:1204
 msgid "name of the new submodule"
 msgstr "新�模组的�称"
 
-#: builtin/submodule--helper.c:870
+#: builtin/submodule--helper.c:1207
 msgid "url where to clone the submodule from"
 msgstr "克隆�模组的 url 地�"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1213
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:884
+#: builtin/submodule--helper.c:1221
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13449,102 +13745,102 @@ msgstr ""
 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
 "[--name <�字>] [--depth <深度>] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:915
+#: builtin/submodule--helper.c:1252
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "无法克隆 '%s' 到�模组路径 '%s'"
 
-#: builtin/submodule--helper.c:930
+#: builtin/submodule--helper.c:1267
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的�模组目录"
 
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1332
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�模组 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1336
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想�执行 'update --init'？"
 
-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1365
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未�并的�模组 %s"
 
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1394
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过�模组 '%s'"
 
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1527
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划�试"
 
-#: builtin/submodule--helper.c:1201
+#: builtin/submodule--helper.c:1538
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次�试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:1234
+#: builtin/submodule--helper.c:1571
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作区中的路径，递归嵌套�模组"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1575
 msgid "rebase, merge, checkout or none"
 msgstr "rebase�merge�checkout 或 none"
 
-#: builtin/submodule--helper.c:1242
+#: builtin/submodule--helper.c:1579
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:1245
+#: builtin/submodule--helper.c:1582
 msgid "parallel jobs"
 msgstr "并�任务"
 
-#: builtin/submodule--helper.c:1247
+#: builtin/submodule--helper.c:1584
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "�始克隆是�应该�守推�的浅克隆选项"
 
-#: builtin/submodule--helper.c:1248
+#: builtin/submodule--helper.c:1585
 msgid "don't print cloning progress"
 msgstr "��输出克隆进度"
 
-#: builtin/submodule--helper.c:1255
+#: builtin/submodule--helper.c:1592
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:1268
+#: builtin/submodule--helper.c:1605
 msgid "bad value for update parameter"
 msgstr "update �数�值错误"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1673
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr "�模组（%s）的分支�置为继承上级项目的分支，但是上级项目�在任何分支上"
 
-#: builtin/submodule--helper.c:1452
+#: builtin/submodule--helper.c:1789
 msgid "recurse into submodules"
 msgstr "在�模组中递归"
 
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1795
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<路径>...]"
 
-#: builtin/submodule--helper.c:1517
+#: builtin/submodule--helper.c:1857
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s �支� --super-prefix"
 
-#: builtin/submodule--helper.c:1523
+#: builtin/submodule--helper.c:1863
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一个有效的 submodule--helper �命令"
@@ -13647,139 +13943,143 @@ msgstr "无法签署标签"
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
-#: builtin/tag.c:215
+#: builtin/tag.c:216
 msgid "bad object type."
 msgstr "�的对象类型。"
 
-#: builtin/tag.c:261
+#: builtin/tag.c:265
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:268
+#: builtin/tag.c:272
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被�留在 %s\n"
 
-#: builtin/tag.c:376
+#: builtin/tag.c:381
 msgid "list tag names"
 msgstr "列出标签�称"
 
-#: builtin/tag.c:378
+#: builtin/tag.c:383
 msgid "print <n> lines of each tag message"
 msgstr "�个标签信�打� <n> 行"
 
-#: builtin/tag.c:380
+#: builtin/tag.c:385
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:381
+#: builtin/tag.c:386
 msgid "verify tags"
 msgstr "验�标签"
 
-#: builtin/tag.c:383
+#: builtin/tag.c:388
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:385
+#: builtin/tag.c:390
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需�一个说明"
 
-#: builtin/tag.c:387
+#: builtin/tag.c:392
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:389
+#: builtin/tag.c:394
+msgid "force edit of tag message"
+msgstr "强制编辑标签说明"
+
+#: builtin/tag.c:395
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签�的标签"
 
-#: builtin/tag.c:393
+#: builtin/tag.c:399
 msgid "use another key to sign the tag"
 msgstr "使用�外的�钥签�该标签"
 
-#: builtin/tag.c:394
+#: builtin/tag.c:400
 msgid "replace the tag if exists"
 msgstr "如果存在，替�现有的标签"
 
-#: builtin/tag.c:395 builtin/update-ref.c:368
+#: builtin/tag.c:401 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:403
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:404
 msgid "show tag list in columns"
 msgstr "以列的方�显示标签列表"
 
-#: builtin/tag.c:399 builtin/tag.c:401
+#: builtin/tag.c:405 builtin/tag.c:407
 msgid "print only tags that contain the commit"
 msgstr "�打�包�该�交的标签"
 
-#: builtin/tag.c:400 builtin/tag.c:402
+#: builtin/tag.c:406 builtin/tag.c:408
 msgid "print only tags that don't contain the commit"
 msgstr "�打��包�该�交的标签"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:409
 msgid "print only tags that are merged"
 msgstr "�打�已��并的标签"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:410
 msgid "print only tags that are not merged"
 msgstr "�打�尚未�并的标签"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:415
 msgid "print only tags of the object"
 msgstr "�打�指�该对象的标签"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:459
 msgid "--column and -n are incompatible"
 msgstr "--column 和 -n �兼容"
 
-#: builtin/tag.c:475
+#: builtin/tag.c:481
 msgid "-n option is only allowed in list mode"
 msgstr "-n 选项��许用在列表显示模�"
 
-#: builtin/tag.c:477
+#: builtin/tag.c:483
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 选项��许用在列表显示模�"
 
-#: builtin/tag.c:479
+#: builtin/tag.c:485
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 选项��许用在列表显示模�"
 
-#: builtin/tag.c:481
+#: builtin/tag.c:487
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 选项��许用在列表显示模�"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:489
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged 和 --no-merged 选项��许用在列表显示模�"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:500
 msgid "only one -F or -m option is allowed."
 msgstr "��许一个 -F 或 -m 选项。"
 
-#: builtin/tag.c:513
+#: builtin/tag.c:519
 msgid "too many params"
 msgstr "太多�数"
 
-#: builtin/tag.c:519
+#: builtin/tag.c:525
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一个有效的标签�称。"
 
-#: builtin/tag.c:524
+#: builtin/tag.c:530
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:561
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
 
-#: builtin/unpack-objects.c:494
+#: builtin/unpack-objects.c:498
 msgid "Unpacking objects"
 msgstr "展开对象中"
 
@@ -14018,7 +14318,7 @@ msgstr "缓存未跟踪文件在 '%s' �用"
 
 #: builtin/update-index.c:1171
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr "core.fsmonitor 未设置；如果想��用 fsmonitor 请设置"
+msgstr "core.fsmonitor 未设置；如果想��用 fsmonitor 请设置该选项"
 
 #: builtin/update-index.c:1175
 msgid "fsmonitor enabled"
@@ -14027,7 +14327,7 @@ msgstr "fsmonitor 被�用"
 #: builtin/update-index.c:1178
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr "core.fsmonitor 已设置；如果想��用 fsmonitor 请移除设置"
+msgstr "core.fsmonitor 已设置；如果想��用 fsmonitor 请移除该选项"
 
 #: builtin/update-index.c:1182
 msgid "fsmonitor disabled"
@@ -14102,8 +14402,8 @@ msgid "print tag contents"
 msgstr "打�标签内容"
 
 #: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<选项>] <路径> [<分支>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<选项>] <路径> [<�交>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
@@ -14114,132 +14414,217 @@ msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<选项>] <路径>"
 
 #: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <工作区> <新路径>"
+
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<选项>]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<选项>] <工作区>"
+
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路径>"
 
-#: builtin/worktree.c:58
+#: builtin/worktree.c:60
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "删除工作区/%s：�是一个有效的目录"
 
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "删除 worktrees/%s：gitdir 文件�存在"
 
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:71 builtin/worktree.c:80
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "删除 worktrees/%s：无法读� gitdir 文件 (%s)"
 
-#: builtin/worktree.c:88
+#: builtin/worktree.c:90
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr "删除工作树/%s：读�过短（期望 %<PRIuMAX> 字节，读� %<PRIuMAX>）"
 
-#: builtin/worktree.c:96
+#: builtin/worktree.c:98
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
 
-#: builtin/worktree.c:112
+#: builtin/worktree.c:114
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "删除 worktrees/%s：gitdir 文件的指��存在"
 
-#: builtin/worktree.c:159
+#: builtin/worktree.c:161
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c:161
+#: builtin/worktree.c:163
 msgid "expire working trees older than <time>"
 msgstr "将早于 <时间> 的工作区过期"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:238
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已�存在"
 
-#: builtin/worktree.c:267
+#: builtin/worktree.c:269
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/worktree.c:306
+#: builtin/worktree.c:308
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "准备 %s（标识符 %s）"
 
-#: builtin/worktree.c:368
+#: builtin/worktree.c:385
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，�使已�被检出到其它工作区"
 
-#: builtin/worktree.c:370
+#: builtin/worktree.c:388
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:372
+#: builtin/worktree.c:390
 msgid "create or reset a branch"
 msgstr "创建或�置一个分支"
 
-#: builtin/worktree.c:374
+#: builtin/worktree.c:392
 msgid "populate the new working tree"
 msgstr "生�新的工作区"
 
-#: builtin/worktree.c:375
+#: builtin/worktree.c:393
 msgid "keep the new working tree locked"
 msgstr "�定新工作区"
 
-#: builtin/worktree.c:377
+#: builtin/worktree.c:395
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "设置跟踪模�（�� git-branch(1)）"
 
-#: builtin/worktree.c:380
+#: builtin/worktree.c:398
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "�试为新分支�匹�一个远程跟踪分支"
 
-#: builtin/worktree.c:388
+#: builtin/worktree.c:406
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b�-B 和 --detach 是互斥的"
 
-#: builtin/worktree.c:453
+#: builtin/worktree.c:471
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "�能在创建新分支时使用选项 --[no-]track "
 
-#: builtin/worktree.c:553
+#: builtin/worktree.c:571
 msgid "reason for locking"
 msgstr "�定原因"
 
-#: builtin/worktree.c:565 builtin/worktree.c:598
+#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
+#: builtin/worktree.c:809
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' �是一个工作区"
 
-#: builtin/worktree.c:567 builtin/worktree.c:600
+#: builtin/worktree.c:585 builtin/worktree.c:618
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加�或解�"
 
-#: builtin/worktree.c:572
+#: builtin/worktree.c:590
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被�定，原因：%s"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:592
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被�定"
 
-#: builtin/worktree.c:602
+#: builtin/worktree.c:620
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被�定"
 
+#: builtin/worktree.c:645
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "�能移动或删除包��模组的工作区"
+
+#: builtin/worktree.c:672 builtin/worktree.c:811
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' 是一个主工作区"
+
+#: builtin/worktree.c:677
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "无法从 '%s' 算出目标�称"
+
+#: builtin/worktree.c:683
+#, c-format
+msgid "target '%s' already exists"
+msgstr "目标 '%s' 已存在"
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
+msgstr "无法移动一个�定的工作区，�定原因：%s"
+
+#: builtin/worktree.c:692
+msgid "cannot move a locked working tree"
+msgstr "无法移动一个�定的工作区"
+
+#: builtin/worktree.c:695
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "验�失败，无法移动工作区：%s"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "无法移动 '%s' 到 '%s'"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "无法在 '%s' 中执行 'git status'"
+
+#: builtin/worktree.c:752
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s' 是�的，使用 --force 删除"
+
+#: builtin/worktree.c:757
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "无法在 '%s' 中执行 'git status'，退出� %d"
+
+#: builtin/worktree.c:768 builtin/worktree.c:782
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "无法删除 '%s'"
+
+#: builtin/worktree.c:794
+msgid "force removing even if the worktree is dirty"
+msgstr "强制删除，�使工作区是�的"
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
+msgstr "无法删除一个�定的工作区，�定原因：%s"
+
+#: builtin/worktree.c:817
+msgid "cannot remove a locked working tree"
+msgstr "无法删除一个�定的工作区"
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "验�失败，无法删除工作区：%s"
+
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<�缀>/]"
@@ -14256,23 +14641,23 @@ msgstr "将 <�缀> �目录内容写到一个树对象"
 msgid "only useful for debugging"
 msgstr "�对调试有用"
 
-#: upload-pack.c:24
+#: upload-pack.c:27
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<选项>] <目录>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1070
 msgid "quit after a single request/response exchange"
 msgstr "在一次�独的请求/�应（request/response）交��退出"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1072
 msgid "exit immediately after initial ref advertisement"
 msgstr "在�始的引用广告�立�退出"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1074
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "如果 <目录> �是一个 Git 目录，���试 <目录>/.git/"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1076
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "�活动 <n> 秒钟�终止传输"
 
@@ -14293,6 +14678,20 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "调试信�输出到标准错误"
 
+#: git.c:8
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <path>] [-c <键�>=<值>]\n"
+"           [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<�称>]\n"
+"           <命令> [<�数>]"
+
 #: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
@@ -14303,20 +14702,65 @@ msgstr ""
 "查看 'git help <命令>' 或 'git help <概念>' 以获�给定�命令或概念的\n"
 "帮助。"
 
-#: http.c:339
+#: git.c:95
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "没有为 --git-dir �供目录\n"
+
+#: git.c:109
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "没有为 --namespace �供命�空间\n"
+
+#: git.c:123
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "没有为 --work-tree �供目录\n"
+
+#: git.c:137
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "没有为 --super-prefix �供�缀\n"
+
+#: git.c:159
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "应为 -c �供一个�置字符串\n"
+
+#: git.c:197
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "没有为 -C �供目录\n"
+
+#: git.c:212
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "未知选项：%s\n"
+
+#: git.c:687
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "展开别�命令 '%s' 失败，'%s' �是一个 git 命令\n"
+
+#: git.c:699
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "无法�行命令 '%s'：%s\n"
+
+#: http.c:342
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer 为负值，默认为 %d"
 
-#: http.c:360
+#: http.c:363
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "当 cURL < 7.22.0 时，�支�委托控制"
 
-#: http.c:369
+#: http.c:372
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "�支�公钥文件�定，因为 cURL < 7.44.0"
 
-#: http.c:1791
+#: http.c:1857
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14327,16 +14771,16 @@ msgstr ""
 "     请求：%s\n"
 "   �定�：%s"
 
-#: remote-curl.c:324
+#: remote-curl.c:345
 #, c-format
 msgid "redirecting to %s"
 msgstr "�定�到 %s"
 
-#: list-objects-filter-options.h:54
+#: list-objects-filter-options.h:59
 msgid "args"
 msgstr "�数"
 
-#: list-objects-filter-options.h:55
+#: list-objects-filter-options.h:60
 msgid "object filtering"
 msgstr "对象过滤"
 
@@ -14444,23 +14888,23 @@ msgstr "显示工作区状�"
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "创建�列出�删除或校验一个 GPG 签�的标签对象"
 
-#: parse-options.h:145
+#: parse-options.h:157
 msgid "expiry-date"
 msgstr "到期时间"
 
-#: parse-options.h:160
+#: parse-options.h:172
 msgid "no-op (backward compatibility)"
 msgstr "空�作（��兼容）"
 
-#: parse-options.h:238
+#: parse-options.h:250
 msgid "be more verbose"
 msgstr "更加详细"
 
-#: parse-options.h:240
+#: parse-options.h:252
 msgid "be more quiet"
 msgstr "更加安�"
 
-#: parse-options.h:246
+#: parse-options.h:258
 msgid "use <n> digits to display SHA-1s"
 msgstr "用 <n> �数字显示 SHA-1 哈希值"
 
@@ -14688,7 +15132,7 @@ msgstr "�试和 $pretty_name 的简��并"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "简��并未生效，�试自动�并。"
 
-#: git-rebase.sh:58
+#: git-rebase.sh:60
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -14701,41 +15145,41 @@ msgstr ""
 "\"git rebase --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
 "\"git rebase\" 执行之�的状�，执行 \"git rebase --abort\"。"
 
-#: git-rebase.sh:160 git-rebase.sh:402
+#: git-rebase.sh:163 git-rebase.sh:409
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "无法移回 $head_name"
 
-#: git-rebase.sh:171
+#: git-rebase.sh:174
 msgid "Applied autostash."
 msgstr "�功应用 autostash。"
 
-#: git-rebase.sh:174
+#: git-rebase.sh:177
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "无法�存 $stash_sha1"
 
-#: git-rebase.sh:214
+#: git-rebase.sh:218
 msgid "The pre-rebase hook refused to rebase."
 msgstr "钩� pre-rebase 拒��基�作。"
 
-#: git-rebase.sh:219
+#: git-rebase.sh:223
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "看起� 'git-am' 正在执行中。无法�基。"
 
-#: git-rebase.sh:363
+#: git-rebase.sh:370
 msgid "No rebase in progress?"
 msgstr "没有正在进行的�基？"
 
-#: git-rebase.sh:374
+#: git-rebase.sh:381
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo �能用在交互��基过程中。"
 
-#: git-rebase.sh:381
+#: git-rebase.sh:388
 msgid "Cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: git-rebase.sh:384
+#: git-rebase.sh:391
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14743,7 +15187,7 @@ msgstr ""
 "您必须编辑所有的�并冲�，然�通过 git add\n"
 "命令将它们标记为已解决"
 
-#: git-rebase.sh:424
+#: git-rebase.sh:435
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14762,74 +15206,74 @@ msgstr ""
 "\t$cmd_clear_stale_rebase\n"
 "然���新执行�基�作。 为��丢失��数�，我已��止当��作。"
 
-#: git-rebase.sh:480
+#: git-rebase.sh:491
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "无效的上游 '$upstream_name'"
 
-#: git-rebase.sh:504
+#: git-rebase.sh:515
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 有一个以上的�并基准"
 
-#: git-rebase.sh:507 git-rebase.sh:511
+#: git-rebase.sh:518 git-rebase.sh:522
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 没有�并基准"
 
-#: git-rebase.sh:516
+#: git-rebase.sh:527
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "没有指�一个有效的�交：$onto_name"
 
-#: git-rebase.sh:542
+#: git-rebase.sh:553
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "严�错误：无此分支/�交 '$branch_name'"
 
-#: git-rebase.sh:575
+#: git-rebase.sh:586
 msgid "Cannot autostash"
 msgstr "无法 autostash"
 
-#: git-rebase.sh:580
+#: git-rebase.sh:591
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "创建了 autostash: $stash_abbrev"
 
-#: git-rebase.sh:584
+#: git-rebase.sh:595
 msgid "Please commit or stash them."
 msgstr "请�交或贮�修改。"
 
-#: git-rebase.sh:607
+#: git-rebase.sh:618
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: git-rebase.sh:609
+#: git-rebase.sh:620
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "当�分支 $branch_name 是最新的。"
 
-#: git-rebase.sh:617
+#: git-rebase.sh:628
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，强制�基。"
 
-#: git-rebase.sh:619
+#: git-rebase.sh:630
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "当�分支 $branch_name 是最新的，强制�基。"
 
-#: git-rebase.sh:631
+#: git-rebase.sh:642
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "�更从 $mb 到 $onto："
 
-#: git-rebase.sh:640
+#: git-rebase.sh:651
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "首先，回退分支以便在上��放您的工作..."
 
-#: git-rebase.sh:650
+#: git-rebase.sh:661
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "快进 $branch_name 至 $onto_name。"
@@ -14897,86 +15341,86 @@ msgstr "无法�存当�状�"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "�存工作目录和索引状� $stash_msg"
 
-#: git-stash.sh:341
+#: git-stash.sh:340
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区�更"
 
-#: git-stash.sh:489
+#: git-stash.sh:488
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "未知选项: $opt"
 
-#: git-stash.sh:502
+#: git-stash.sh:501
 msgid "No stash entries found."
 msgstr "未�现贮��目。"
 
-#: git-stash.sh:509
+#: git-stash.sh:508
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "指定了太多的版本：$REV"
 
-#: git-stash.sh:524
+#: git-stash.sh:523
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference �是一个有效的引用"
 
-#: git-stash.sh:552
+#: git-stash.sh:551
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' �是贮���交"
 
-#: git-stash.sh:563
+#: git-stash.sh:562
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' �是一个贮�引用"
 
-#: git-stash.sh:571
+#: git-stash.sh:570
 msgid "unable to refresh index"
 msgstr "无法刷新索引"
 
-#: git-stash.sh:575
+#: git-stash.sh:574
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "无法在�并过程应用贮�"
 
-#: git-stash.sh:583
+#: git-stash.sh:582
 msgid "Conflicts in index. Try without --index."
 msgstr "索引中有冲�。�试�使用 --index。"
 
-#: git-stash.sh:585
+#: git-stash.sh:584
 msgid "Could not save index tree"
 msgstr "�能�存索引树"
 
-#: git-stash.sh:594
+#: git-stash.sh:593
 msgid "Could not restore untracked files from stash entry"
 msgstr "无法从贮��目中��未跟踪文件"
 
-#: git-stash.sh:619
+#: git-stash.sh:618
 msgid "Cannot unstage modified files"
 msgstr "无法将修改的文件�消暂存"
 
-#: git-stash.sh:634
+#: git-stash.sh:633
 msgid "Index was not unstashed."
 msgstr "索引未从贮�中��。"
 
-#: git-stash.sh:648
+#: git-stash.sh:647
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮��目被�留以备您�次需�。"
 
-#: git-stash.sh:657
+#: git-stash.sh:656
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "丢弃了 ${REV} ($s)"
 
-#: git-stash.sh:658
+#: git-stash.sh:657
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}：无法丢弃贮��目"
 
-#: git-stash.sh:666
+#: git-stash.sh:665
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: git-stash.sh:745
+#: git-stash.sh:744
 msgid "(To restore them type \"git stash apply\")"
 msgstr "（为��数�输入 \"git stash apply\"）"
 
@@ -15070,75 +15514,29 @@ msgstr "正在进入 '$displaypath'"
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "�止于 '$displaypath'；脚本返回�零值。"
 
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "pathspec 和 --all �兼容"
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "如果您确实想�对所有�模组执行�消�始化，请使用 '--all'"
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"�模组工作区 '$displaypath' 包�一个 .git 目录\n"
-"（如果您真的想删除它�其全部历�，使用 'rm -rf' 命令）"
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr "�模组工作区 '$displaypath' 包�本地修改；使用 '-f' 丢弃它们"
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "已清除目录 '$displaypath'"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "无法移除�模组工作区 '$displaypath'"
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "�能创建空的�模组目录 '$displaypath'"
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr "�模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-
-#: git-submodule.sh:637
+#: git-submodule.sh:584
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中找到当�版本"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:594
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中获�"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:599
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中找到当�版本 ${remote_name}/${branch}"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:617
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中获�"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:623
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15146,83 +15544,78 @@ msgid ""
 msgstr ""
 "获�了�模组路径 '$displaypath'，但是它没有包� $sha1。直接获�该�交失败。"
 
-#: git-submodule.sh:683
+#: git-submodule.sh:630
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中检出 '$sha1'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�模组路径 '$displaypath'：检出 '$sha1'"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:635
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中�基 '$sha1'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:636
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "�模组路径 '$displaypath'：�基至 '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:641
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "无法�并 '$sha1' 到�模组路径 '$displaypath' 中"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:642
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "�模组路径 '$displaypath'：已�并入 '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:647
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "在�模组 '$displaypath' 中执行 '$command $sha1' 失败"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:648
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "�模组 '$displaypath'：'$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:679
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进�模组路径 '$displaypath'"
 
-#: git-submodule.sh:828
+#: git-submodule.sh:775
 msgid "The --cached option cannot be used with the --files option"
 msgstr "选项 --cached �能和选项 --files �时使用"
 
-#: git-submodule.sh:880
+#: git-submodule.sh:827
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "�外的模� $mod_dst"
 
 #  译者：注����导空格
-#: git-submodule.sh:900
+#: git-submodule.sh:847
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包��交 $sha1_src"
 
 #  译者：注����导空格
-#: git-submodule.sh:903
+#: git-submodule.sh:850
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包��交 $sha1_dst"
 
 #  译者：注����导空格
-#: git-submodule.sh:906
+#: git-submodule.sh:853
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  警告：$display_name 未包��交 $sha1_src 和 $sha1_dst"
 
-#: git-submodule.sh:1077
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "为 '$displaypath' �步�模组 url"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -15275,7 +15668,7 @@ msgstr ""
 "\n"
 "如果您在这里删除一行，对应的�交将会丢失。\n"
 
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:213
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15294,83 +15687,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: git-rebase--interactive.sh:238
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1：�是一个�以被拣选的�交"
 
-#: git-rebase--interactive.sh:275
+#: git-rebase--interactive.sh:277
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "无效的�交�：$sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--interactive.sh:319
 msgid "Cannot write current commit's replacement sha1"
 msgstr "�能写入当��交的替代 sha1"
 
-#: git-rebase--interactive.sh:369
+#: git-rebase--interactive.sh:371
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "快进到 $sha1"
 
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:373
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "�能快进到 $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--interactive.sh:382
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "�能移动 HEAD 到 $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--interactive.sh:387
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "拒�压缩一个�并：$sha1"
 
-#: git-rebase--interactive.sh:400
+#: git-rebase--interactive.sh:405
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "无法���并 $sha1"
 
-#: git-rebase--interactive.sh:408
+#: git-rebase--interactive.sh:414
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "�能拣选 $sha1"
 
-#: git-rebase--interactive.sh:417
+#: git-rebase--interactive.sh:423
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "这是�交说明 #${n}："
 
-#: git-rebase--interactive.sh:422
+#: git-rebase--interactive.sh:428
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "�交说明 #${n} 将被跳过："
 
-#: git-rebase--interactive.sh:433
+#: git-rebase--interactive.sh:439
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "这是一个 $count 个�交的组�。"
 msgstr[1] "这是一个 $count 个�交的组�。"
 
-#: git-rebase--interactive.sh:442
+#: git-rebase--interactive.sh:448
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�能写入 $fixup_msg"
 
-#: git-rebase--interactive.sh:445
+#: git-rebase--interactive.sh:451
 msgid "This is a combination of 2 commits."
 msgstr "这是一个 2 个�交的组�。"
 
-#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
-#: git-rebase--interactive.sh:532
+#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
+#: git-rebase--interactive.sh:538
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "�能应用 $sha1... $rest"
 
-#: git-rebase--interactive.sh:560
+#: git-rebase--interactive.sh:567
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15383,32 +15776,32 @@ msgstr ""
 "这通常是因为空的�交说明，或者 pre-commit 钩�执行失败。如果是 pre-commit\n"
 "钩�执行失败，你�能需�在�写�交说明�解决这个问题。"
 
-#: git-rebase--interactive.sh:575
+#: git-rebase--interactive.sh:582
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "�止在 $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:590
+#: git-rebase--interactive.sh:597
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "没有父�交的情况下�能 '$squash_style'"
 
-#: git-rebase--interactive.sh:632
+#: git-rebase--interactive.sh:639
 #, sh-format
 msgid "Executing: $rest"
 msgstr "执行：$rest"
 
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:647
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "执行失败：$rest"
 
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:649
 msgid "and made changes to the index and/or the working tree"
 msgstr "并且修改索引和/或工作区"
 
 #  译者：注����导空格
-#: git-rebase--interactive.sh:644
+#: git-rebase--interactive.sh:651
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15419,7 +15812,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:664
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15433,29 +15826,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:675
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "未知命令：$command $sha1 $rest"
 
-#: git-rebase--interactive.sh:669
+#: git-rebase--interactive.sh:676
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "�修改请使用命令 'git rebase --edit-todo'。"
 
-#: git-rebase--interactive.sh:704
+#: git-rebase--interactive.sh:711
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "�功�基并更新 $head_name。"
 
-#: git-rebase--interactive.sh:728
+#: git-rebase--interactive.sh:735
 msgid "could not detach HEAD"
 msgstr "�能检出为分离头指针"
 
-#: git-rebase--interactive.sh:763
+#: git-rebase--interactive.sh:771
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:768
+#: git-rebase--interactive.sh:776
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15484,22 +15877,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:785
+#: git-rebase--interactive.sh:793
 msgid "Error trying to find the author identity to amend commit"
 msgstr "在修补�交中查找作者信�时�到错误"
 
-#: git-rebase--interactive.sh:790
+#: git-rebase--interactive.sh:798
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 "您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
 
-#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
+#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807
 msgid "Could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: git-rebase--interactive.sh:827
+#: git-rebase--interactive.sh:836
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15513,44 +15906,44 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
 msgid "Could not execute editor"
 msgstr "无法�行编辑器"
 
-#: git-rebase--interactive.sh:848
+#: git-rebase--interactive.sh:860
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "�能检出 $switch_to"
 
-#: git-rebase--interactive.sh:853
+#: git-rebase--interactive.sh:865
 msgid "No HEAD?"
 msgstr "没有 HEAD？"
 
-#: git-rebase--interactive.sh:854
+#: git-rebase--interactive.sh:866
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "�能创建临时 $state_dir"
 
-#: git-rebase--interactive.sh:856
+#: git-rebase--interactive.sh:869
 msgid "Could not mark as interactive"
 msgstr "�能标记为交互�"
 
-#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
 msgid "Could not init rewritten commits"
 msgstr "�能对�写�交进行�始化"
 
-#: git-rebase--interactive.sh:897
+#: git-rebase--interactive.sh:910
 msgid "Could not generate todo list"
 msgstr "无法生�待办列表"
 
-#: git-rebase--interactive.sh:973
+#: git-rebase--interactive.sh:986
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "�基 $shortrevisions 到 $shortonto（$todocount 个�交）"
 msgstr[1] "�基 $shortrevisions 到 $shortonto（$todocount 个�交）"
 
-#: git-rebase--interactive.sh:978
+#: git-rebase--interactive.sh:991
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15560,7 +15953,7 @@ msgstr ""
 "然而，如果您删除全部内容，�基�作将会终止。\n"
 "\n"
 
-#: git-rebase--interactive.sh:985
+#: git-rebase--interactive.sh:998
 msgid "Note that empty commits are commented out"
 msgstr "注�空�交已被注释掉"
 
@@ -15696,46 +16089,46 @@ msgstr "添加未跟踪的"
 msgid "No untracked files.\n"
 msgstr "没有未跟踪的文件。\n"
 
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1026
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果补�能干净地应用，编辑�将立�标记为暂存。"
 
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1029
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果补�能干净地应用，编辑�将立�标记为贮�。"
 
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1032
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果补�能干净地应用，编辑�将立�标记为未暂存。"
 
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果补�能干净地应用，编辑�将立�标记为应用。"
 
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果补�能干净地应用，编辑�将立�标记为丢弃。"
 
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1078
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "无法写入�编辑文件：%s"
 
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1079
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手动�编辑模� -- 查看底部的快速指�。\n"
 
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1085
 #, perl-format
 msgid ""
 "---\n"
@@ -15749,7 +16142,7 @@ msgstr ""
 "以 %s 开始的行将被删除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1093
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15758,7 +16151,7 @@ msgstr ""
 "如果�能干净地应用，您将有机会�新编辑。如果该�的全部内容删除，则\n"
 "此次编辑被终止，该��会被修改。\n"
 
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1107
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "无法读��编辑文件：%s"
@@ -15769,12 +16162,12 @@ msgstr "无法读��编辑文件：%s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1206
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的编辑��能被应用。�新编辑（选择 \"no\" 丢弃�） [y/n]? "
 
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1215
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15788,7 +16181,7 @@ msgstr ""
 "a - 暂存该�和本文件中��的全部�\n"
 "d - �暂存该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1221
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15802,7 +16195,7 @@ msgstr ""
 "a - 贮�该�和本文件中��的全部�\n"
 "d - �贮�该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1227
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15816,7 +16209,7 @@ msgstr ""
 "a - �暂存该�和本文件中��的全部�\n"
 "d - ���暂存该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1233
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15830,7 +16223,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1239
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15844,7 +16237,7 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1245
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15858,7 +16251,7 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1251
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15872,7 +16265,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1266
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15894,195 +16287,211 @@ msgstr ""
 "e - 手动编辑当��\n"
 "? - 显示帮助\n"
 
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1297
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "选中的��能应用到索引�\n"
 
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1298
 msgid "Apply them to the worktree anyway? "
 msgstr "无论如何都�应用到工作区么？"
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1301
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未�入的：%s\n"
 
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1321
 msgid "Only binary files changed.\n"
 msgstr "�有二进制文件被修改。\n"
 
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1323
 msgid "No changes.\n"
 msgstr "没有修改。\n"
 
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1331
 msgid "Patch update"
 msgstr "补�更新"
 
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1383
 #, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "暂存状�修改 [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "暂存模��更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1384
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "暂存状�删除 [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1385
 #, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "暂存该� [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "暂存该� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1388
 #, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "贮�状�修改 [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "贮�模��更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1389
 #, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "贮�状�删除 [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "贮�删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1390
 #, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "贮�该� [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "贮�该� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1393
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "未暂存状�修改 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "�消暂存模��更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1394
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "未暂存状�删除 [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "�消暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1395
 #, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "�暂存该� [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "�消暂存该� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1398
 #, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "修改索引中的应用状� [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "将模��更应用到索引 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1399
 #, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "从索引中删除应用状� [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1400
 #, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "将此�应用到索引 [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "将该�应用到索引 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1403
 #, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "修改工作区中的丢弃状� [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃模��更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1404
 #, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从工作区中删除丢弃状� [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1405
 #, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从工作区中丢弃该� [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃该� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1408
 #, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "修改索引和工作区中的丢弃状� [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "从索引和工作区中丢弃模��更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1409
 #, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从索引和工作区中删除丢弃状� [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1410
 #, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从索引和工作区中丢弃该� [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "从索引和工作区中丢弃该� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1413
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "修改索引和工作区中的应用状� [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "将模��更应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1414
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "从索引和工作区中删除应用状� [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1415
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "在索引和工作区中应用该� [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "将该�应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1515
+msgid "No other hunks to goto\n"
+msgstr "没有其它�供跳转的�\n"
+
+#: git-add--interactive.perl:1522
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳转到哪个�（<回车> 查看更多）？ "
 
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1524
 msgid "go to which hunk? "
 msgstr "跳转到哪个�？"
 
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1533
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "无效数字：'%s'\n"
 
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1538
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "对�起，�有 %d 个�用�。\n"
 msgstr[1] "对�起，�有 %d 个�用�。\n"
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1564
+msgid "No other hunks to search\n"
+msgstr "没有其它�供查找的�\n"
+
+#: git-add--interactive.perl:1568
 msgid "search for regex? "
 msgstr "使用正则表达��索？"
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1581
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "错误的正则表达� %s：%s\n"
 
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1591
 msgid "No hunk matches the given pattern\n"
 msgstr "没有和给定模�相匹�的快\n"
 
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
 msgid "No previous hunk\n"
 msgstr "没有�一个�\n"
 
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
 msgid "No next hunk\n"
 msgstr "没有下一个�\n"
 
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1637
+msgid "Sorry, cannot split this hunk\n"
+msgstr "对�起，�能拆分这个�\n"
+
+#: git-add--interactive.perl:1643
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "拆分为 %d �。\n"
 msgstr[1] "拆分为 %d �。\n"
 
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1653
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "对�起，�能编辑这个�\n"
+
+#: git-add--interactive.perl:1699
 msgid "Review diff"
 msgstr "检视 diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1718
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16099,84 +16508,90 @@ msgstr ""
 "diff          - 显示 HEAD 和索引间差异\n"
 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
 
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
+#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
+#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
 msgid "missing --"
 msgstr "缺失 --"
 
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1756
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模�：%s"
 
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "无效的�数 %s，期望是 --"
 
-#: git-send-email.perl:126
+#: git-send-email.perl:130
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本地时间和 GMT 有�到一分钟间隔\n"
 
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间�移�大于等于 24 �时\n"
 
-#: git-send-email.perl:207 git-send-email.perl:213
+#: git-send-email.perl:211 git-send-email.perl:217
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器�正常退出，终止所有�作"
 
-#: git-send-email.perl:290
+#: git-send-email.perl:294
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包�您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl:295
+#: git-send-email.perl:299
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�编辑的邮件。\n"
 
-#: git-send-email.perl:313
+#: git-send-email.perl:317
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项�兼容\n"
 
-#: git-send-email.perl:378 git-send-email.perl:629
+#: git-send-email.perl:383 git-send-email.perl:638
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�能在仓库之外�行 git format-patch\n"
 
-#: git-send-email.perl:447
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr "`batch-size` 和 `relogin` 必须�时定义（通过命令行或者�置选项）\n"
+
+#: git-send-email.perl:456
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:476
+#: git-send-email.perl:485
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:504
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：�支�带引�的 sendmail 别�：%s\n"
 
-#: git-send-email.perl:506
+#: git-send-email.perl:515
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:508
+#: git-send-email.perl:517
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：�支� `/file` 或 `|pipe` �定�：%s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:522
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:595
+#: git-send-email.perl:604
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16191,12 +16606,12 @@ msgstr ""
 "    * 如果�义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果�义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:616
+#: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:640
+#: git-send-email.perl:649
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16205,7 +16620,7 @@ msgstr ""
 "严�：%s：%s\n"
 "警告：补�未能��\n"
 
-#: git-send-email.perl:651
+#: git-send-email.perl:660
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16215,17 +16630,17 @@ msgstr ""
 "未指定补�文件�\n"
 "\n"
 
-#: git-send-email.perl:664
+#: git-send-email.perl:673
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:674
+#: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "无法写入 %s: %s"
 
-#: git-send-email.perl:684
+#: git-send-email.perl:694
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16238,41 +16653,37 @@ msgstr ""
 "\n"
 "如果您�想��摘�，清除内容。\n"
 
-#: git-send-email.perl:707
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "无法打开 %s.final: %s"
-
-#: git-send-email.perl:710
+#: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:745
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "To/Cc/Bcc 字段�解�，它们被忽略\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘�邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:786
+#: git-send-email.perl:813
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认�使用 <%s> [y/N]？"
 
-#: git-send-email.perl:815
+#: git-send-email.perl:868
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "如下文件� 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:873
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�声明 8bit 为什么样的编�格� [UTF-8]？"
 
-#: git-send-email.perl:828
+#: git-send-email.perl:881
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16284,20 +16695,20 @@ msgstr ""
 "\t%s\n"
 "包�模版标题 '*** SUBJECT HERE ***'。如果确实想���，使用�数 --force。\n"
 
-#: git-send-email.perl:847
+#: git-send-email.perl:900
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将���给�？"
 
-#: git-send-email.perl:865
+#: git-send-email.perl:918
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "严�：别� '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:877
+#: git-send-email.perl:930
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID 被用作第一�邮件的 In-Reply-To ？"
 
-#: git-send-email.perl:929 git-send-email.perl:937
+#: git-send-email.perl:988 git-send-email.perl:996
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：�能从 %s 中��一个有效的邮件地�\n"
@@ -16305,16 +16716,16 @@ msgstr "错误：�能从 %s 中��一个有效的邮件地�\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:941
+#: git-send-email.perl:1000
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处�这个地�？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl:1262
+#: git-send-email.perl:1317
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" �存在"
 
-#: git-send-email.perl:1337
+#: git-send-email.perl:1395
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16339,132 +16750,150 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1352
+#: git-send-email.perl:1410
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "��邮件？([y]es|[n]o|[q]uit|[a]ll)："
 
-#: git-send-email.perl:1355
+#: git-send-email.perl:1413
 msgid "Send this email reply required"
 msgstr "���求的邮件回�"
 
-#: git-send-email.perl:1381
+#: git-send-email.perl:1439
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP �务器未被正确定义。"
 
-#: git-send-email.perl:1428
+#: git-send-email.perl:1486
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "�务器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1433 git-send-email.perl:1437
+#: git-send-email.perl:1491 git-send-email.perl:1495
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败�%s"
 
-#: git-send-email.perl:1447
+#: git-send-email.perl:1505
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地�始化 SMTP。检查�置并使用 --smtp-debug。"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1523
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法�� %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习�� %s\n"
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1526
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正�� %s\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "Dry-OK. Log says:\n"
 msgstr "演习�功。日志说：\n"
 
-#: git-send-email.perl:1470
+#: git-send-email.perl:1528
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1482
+#: git-send-email.perl:1540
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1485
+#: git-send-email.perl:1543
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1498
+#: git-send-email.perl:1556
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1545 git-send-email.perl:1565
+#: git-send-email.perl:1603 git-send-email.perl:1623
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1551
+#: git-send-email.perl:1609
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1657
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1624
+#: git-send-email.perl:1682
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1788
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能执行 '%s'"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1795
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:1741
+#: git-send-email.perl:1799
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管�至 '%s'"
 
-#: git-send-email.perl:1768
+#: git-send-email.perl:1826
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形���信�"
 
-#: git-send-email.perl:1776
+#: git-send-email.perl:1834
 msgid "invalid transfer encoding"
 msgstr "无效的传�编�"
 
-#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "�能打开 %s：%s\n"
 
-#: git-send-email.perl:1817
+#: git-send-email.perl:1875
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s：补�包�一个超过 998 字符的行"
 
-#: git-send-email.perl:1833
+#: git-send-email.perl:1891
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "略过 %s �备份�缀 '%s'。\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1837
+#: git-send-email.perl:1895
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的��� %s？[y|N]："
 
+#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgstr "To/Cc/Bcc 字段�解�，它们被忽略\n"
+
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack：应为 ACK/NAK，�得到 EOF"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "失败的补�文件副本�于：%s"
+
+#~ msgid "invalid filter-spec expression '%s'"
+#~ msgstr "无效的 filter-spec 表达� '%s'"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "pathspec 和 --all �兼容"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr "�模组 '$name' ($url) 未对路径 '$displaypath' 注册"
+
 #~ msgid ""
 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
 #~ "please use . instead if you meant to match all paths"
diff --git a/preload-index.c b/preload-index.c
index 2a83255..4d08d44 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -78,6 +78,7 @@ static void preload_index(struct index_state *index,
 {
 	int threads, i, work, offset;
 	struct thread_data data[MAX_PARALLEL];
+	uint64_t start = getnanotime();
 
 	if (!core_preload_index)
 		return;
@@ -108,6 +109,7 @@ static void preload_index(struct index_state *index,
 		if (pthread_join(p->pthread, NULL))
 			die("unable to join threaded lstat");
 	}
+	trace_performance_since(start, "preload index");
 }
 #endif
 
diff --git a/pretty.c b/pretty.c
index f7ce490..34fe891 100644
--- a/pretty.c
+++ b/pretty.c
@@ -549,7 +549,7 @@ static void add_merge_info(const struct pretty_print_context *pp,
 		struct object_id *oidp = &parent->item->object.oid;
 		strbuf_addch(sb, ' ');
 		if (pp->abbrev)
-			strbuf_add_unique_abbrev(sb, oidp->hash, pp->abbrev);
+			strbuf_add_unique_abbrev(sb, oidp, pp->abbrev);
 		else
 			strbuf_addstr(sb, oid_to_hex(oidp));
 		parent = parent->next;
@@ -1156,7 +1156,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		return 1;
 	case 'h':		/* abbreviated commit hash */
 		strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT));
-		strbuf_add_unique_abbrev(sb, commit->object.oid.hash,
+		strbuf_add_unique_abbrev(sb, &commit->object.oid,
 					 c->pretty_ctx->abbrev);
 		strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
 		return 1;
@@ -1164,7 +1164,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		strbuf_addstr(sb, oid_to_hex(&commit->tree->object.oid));
 		return 1;
 	case 't':		/* abbreviated tree hash */
-		strbuf_add_unique_abbrev(sb, commit->tree->object.oid.hash,
+		strbuf_add_unique_abbrev(sb, &commit->tree->object.oid,
 					 c->pretty_ctx->abbrev);
 		return 1;
 	case 'P':		/* parent hashes */
@@ -1178,7 +1178,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		for (p = commit->parents; p; p = p->next) {
 			if (p != commit->parents)
 				strbuf_addch(sb, ' ');
-			strbuf_add_unique_abbrev(sb, p->item->object.oid.hash,
+			strbuf_add_unique_abbrev(sb, &p->item->object.oid,
 						 c->pretty_ctx->abbrev);
 		}
 		return 1;
diff --git a/quote.c b/quote.c
index 37d2686..c95dd2c 100644
--- a/quote.c
+++ b/quote.c
@@ -118,9 +118,15 @@ static char *sq_dequote_step(char *arg, char **next)
 				*next = NULL;
 			return arg;
 		case '\\':
-			c = *++src;
-			if (need_bs_quote(c) && *++src == '\'') {
-				*dst++ = c;
+			/*
+			 * Allow backslashed characters outside of
+			 * single-quotes only if they need escaping,
+			 * and only if we resume the single-quoted part
+			 * afterward.
+			 */
+			if (need_bs_quote(src[1]) && src[2] == '\'') {
+				*dst++ = src[1];
+				src += 2;
 				continue;
 			}
 		/* Fallthrough */
diff --git a/reachable.c b/reachable.c
index 25cfd99..a6ea33a 100644
--- a/reachable.c
+++ b/reachable.c
@@ -78,7 +78,7 @@ static void add_recent_object(const struct object_id *oid,
 	 * later processing, and the revision machinery expects
 	 * commits and tags to have been parsed.
 	 */
-	type = sha1_object_info(oid->hash, NULL);
+	type = oid_object_info(oid, NULL);
 	if (type < 0)
 		die("unable to get object info for %s", oid_to_hex(oid));
 
@@ -95,7 +95,7 @@ static void add_recent_object(const struct object_id *oid,
 		break;
 	default:
 		die("unknown object type for %s: %s",
-		    oid_to_hex(oid), typename(type));
+		    oid_to_hex(oid), type_name(type));
 	}
 
 	if (!obj)
diff --git a/read-cache.c b/read-cache.c
index 9925a94..10f1c6b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -62,6 +62,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
 	replace_index_entry_in_base(istate, old, ce);
 	remove_name_hash(istate, old);
 	free(old);
+	ce->ce_flags &= ~CE_HASHED;
 	set_index_entry(istate, nr, ce);
 	ce->ce_flags |= CE_UPDATE_IN_BASE;
 	mark_fsmonitor_invalid(istate, ce);
@@ -70,20 +71,20 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
 
 void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
 {
-	struct cache_entry *old = istate->cache[nr], *new;
+	struct cache_entry *old_entry = istate->cache[nr], *new_entry;
 	int namelen = strlen(new_name);
 
-	new = xmalloc(cache_entry_size(namelen));
-	copy_cache_entry(new, old);
-	new->ce_flags &= ~CE_HASHED;
-	new->ce_namelen = namelen;
-	new->index = 0;
-	memcpy(new->name, new_name, namelen + 1);
+	new_entry = xmalloc(cache_entry_size(namelen));
+	copy_cache_entry(new_entry, old_entry);
+	new_entry->ce_flags &= ~CE_HASHED;
+	new_entry->ce_namelen = namelen;
+	new_entry->index = 0;
+	memcpy(new_entry->name, new_name, namelen + 1);
 
-	cache_tree_invalidate_path(istate, old->name);
-	untracked_cache_remove_from_index(istate, old->name);
+	cache_tree_invalidate_path(istate, old_entry->name);
+	untracked_cache_remove_from_index(istate, old_entry->name);
 	remove_index_entry_at(istate, nr);
-	add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+	add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
 }
 
 void fill_stat_data(struct stat_data *sd, struct stat *st)
@@ -184,7 +185,7 @@ static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
 	if (strbuf_readlink(&sb, ce->name, expected_size))
 		return -1;
 
-	buffer = read_sha1_file(ce->oid.hash, &type, &size);
+	buffer = read_object_file(&ce->oid, &type, &size);
 	if (buffer) {
 		if (size == sb.len)
 			match = memcmp(buffer, sb.buf, size);
@@ -615,26 +616,26 @@ static struct cache_entry *create_alias_ce(struct index_state *istate,
 					   struct cache_entry *alias)
 {
 	int len;
-	struct cache_entry *new;
+	struct cache_entry *new_entry;
 
 	if (alias->ce_flags & CE_ADDED)
 		die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
 
 	/* Ok, create the new entry using the name of the existing alias */
 	len = ce_namelen(alias);
-	new = xcalloc(1, cache_entry_size(len));
-	memcpy(new->name, alias->name, len);
-	copy_cache_entry(new, ce);
+	new_entry = xcalloc(1, cache_entry_size(len));
+	memcpy(new_entry->name, alias->name, len);
+	copy_cache_entry(new_entry, ce);
 	save_or_free_index_entry(istate, ce);
-	return new;
+	return new_entry;
 }
 
 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
 {
-	unsigned char sha1[20];
-	if (write_sha1_file("", 0, blob_type, sha1))
+	struct object_id oid;
+	if (write_object_file("", 0, blob_type, &oid))
 		die("cannot create an empty blob in the object database");
-	hashcpy(ce->oid.hash, sha1);
+	oidcpy(&ce->oid, &oid);
 }
 
 int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
@@ -1324,7 +1325,8 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
 
 	size = ce_size(ce);
 	updated = xmalloc(size);
-	memcpy(updated, ce, size);
+	copy_cache_entry(updated, ce);
+	memcpy(updated->name, ce->name, ce->ce_namelen + 1);
 	fill_stat_cache_info(updated, &st);
 	/*
 	 * If ignore_valid is not set, we should leave CE_VALID bit
@@ -1371,6 +1373,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	const char *typechange_fmt;
 	const char *added_fmt;
 	const char *unmerged_fmt;
+	uint64_t start = getnanotime();
 
 	modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
 	deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
@@ -1378,7 +1381,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
 	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
 	for (i = 0; i < istate->cache_nr; i++) {
-		struct cache_entry *ce, *new;
+		struct cache_entry *ce, *new_entry;
 		int cache_errno = 0;
 		int changed = 0;
 		int filtered = 0;
@@ -1407,10 +1410,10 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 		if (filtered)
 			continue;
 
-		new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
-		if (new == ce)
+		new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
+		if (new_entry == ce)
 			continue;
-		if (!new) {
+		if (!new_entry) {
 			const char *fmt;
 
 			if (really && cache_errno == EINVAL) {
@@ -1439,8 +1442,9 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 			continue;
 		}
 
-		replace_index_entry(istate, i, new);
+		replace_index_entry(istate, i, new_entry);
 	}
+	trace_performance_since(start, "refresh index");
 	return has_errors;
 }
 
@@ -1544,8 +1548,8 @@ int verify_ce_order;
 
 static int verify_hdr(struct cache_header *hdr, unsigned long size)
 {
-	git_SHA_CTX c;
-	unsigned char sha1[20];
+	git_hash_ctx c;
+	unsigned char hash[GIT_MAX_RAWSZ];
 	int hdr_version;
 
 	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
@@ -1557,10 +1561,10 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)
 	if (!verify_index_checksum)
 		return 0;
 
-	git_SHA1_Init(&c);
-	git_SHA1_Update(&c, hdr, size - 20);
-	git_SHA1_Final(sha1, &c);
-	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
+	the_hash_algo->init_fn(&c);
+	the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
+	the_hash_algo->final_fn(hash, &c);
+	if (hashcmp(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz))
 		return error("bad index file sha1 signature");
 	return 0;
 }
@@ -1790,7 +1794,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 		die_errno("cannot stat the open index");
 
 	mmap_size = xsize_t(st.st_size);
-	if (mmap_size < sizeof(struct cache_header) + 20)
+	if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
 		die("index file smaller than expected");
 
 	mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -1802,7 +1806,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 	if (verify_hdr(hdr, mmap_size) < 0)
 		goto unmap;
 
-	hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
+	hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);
 	istate->version = ntohl(hdr->hdr_version);
 	istate->cache_nr = ntohl(hdr->hdr_entries);
 	istate->cache_alloc = alloc_nr(istate->cache_nr);
@@ -1830,7 +1834,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 	istate->timestamp.sec = st.st_mtime;
 	istate->timestamp.nsec = ST_MTIME_NSEC(st);
 
-	while (src_offset <= mmap_size - 20 - 8) {
+	while (src_offset <= mmap_size - the_hash_algo->rawsz - 8) {
 		/* After an array of active_nr index entries,
 		 * there can be arbitrary number of extended
 		 * sections, each of which is prefixed with
@@ -1871,6 +1875,7 @@ static void freshen_shared_index(const char *shared_index, int warn)
 int read_index_from(struct index_state *istate, const char *path,
 		    const char *gitdir)
 {
+	uint64_t start = getnanotime();
 	struct split_index *split_index;
 	int ret;
 	char *base_sha1_hex;
@@ -1881,6 +1886,7 @@ int read_index_from(struct index_state *istate, const char *path,
 		return istate->cache_nr;
 
 	ret = do_read_index(istate, path, 0);
+	trace_performance_since(start, "read cache %s", path);
 
 	split_index = istate->split_index;
 	if (!split_index || is_null_sha1(split_index->base_sha1)) {
@@ -1904,6 +1910,7 @@ int read_index_from(struct index_state *istate, const char *path,
 	freshen_shared_index(base_path, 0);
 	merge_base_index(istate);
 	post_read_index_from(istate);
+	trace_performance_since(start, "read cache %s", base_path);
 	free(base_path);
 	return ret;
 }
@@ -1956,11 +1963,11 @@ int unmerged_index(const struct index_state *istate)
 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
 static unsigned long write_buffer_len;
 
-static int ce_write_flush(git_SHA_CTX *context, int fd)
+static int ce_write_flush(git_hash_ctx *context, int fd)
 {
 	unsigned int buffered = write_buffer_len;
 	if (buffered) {
-		git_SHA1_Update(context, write_buffer, buffered);
+		the_hash_algo->update_fn(context, write_buffer, buffered);
 		if (write_in_full(fd, write_buffer, buffered) < 0)
 			return -1;
 		write_buffer_len = 0;
@@ -1968,7 +1975,7 @@ static int ce_write_flush(git_SHA_CTX *context, int fd)
 	return 0;
 }
 
-static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
+static int ce_write(git_hash_ctx *context, int fd, void *data, unsigned int len)
 {
 	while (len) {
 		unsigned int buffered = write_buffer_len;
@@ -1990,7 +1997,7 @@ static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
 	return 0;
 }
 
-static int write_index_ext_header(git_SHA_CTX *context, int fd,
+static int write_index_ext_header(git_hash_ctx *context, int fd,
 				  unsigned int ext, unsigned int sz)
 {
 	ext = htonl(ext);
@@ -1999,26 +2006,26 @@ static int write_index_ext_header(git_SHA_CTX *context, int fd,
 		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
 }
 
-static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
+static int ce_flush(git_hash_ctx *context, int fd, unsigned char *hash)
 {
 	unsigned int left = write_buffer_len;
 
 	if (left) {
 		write_buffer_len = 0;
-		git_SHA1_Update(context, write_buffer, left);
+		the_hash_algo->update_fn(context, write_buffer, left);
 	}
 
-	/* Flush first if not enough space for SHA1 signature */
-	if (left + 20 > WRITE_BUFFER_SIZE) {
+	/* Flush first if not enough space for hash signature */
+	if (left + the_hash_algo->rawsz > WRITE_BUFFER_SIZE) {
 		if (write_in_full(fd, write_buffer, left) < 0)
 			return -1;
 		left = 0;
 	}
 
-	/* Append the SHA1 signature at the end */
-	git_SHA1_Final(write_buffer + left, context);
-	hashcpy(sha1, write_buffer + left);
-	left += 20;
+	/* Append the hash signature at the end */
+	the_hash_algo->final_fn(write_buffer + left, context);
+	hashcpy(hash, write_buffer + left);
+	left += the_hash_algo->rawsz;
 	return (write_in_full(fd, write_buffer, left) < 0) ? -1 : 0;
 }
 
@@ -2099,17 +2106,19 @@ static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
 	}
 }
 
-static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
+static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
 			  struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
 {
 	int size;
-	int saved_namelen = saved_namelen; /* compiler workaround */
 	int result;
+	unsigned int saved_namelen;
+	int stripped_name = 0;
 	static unsigned char padding[8] = { 0x00 };
 
 	if (ce->ce_flags & CE_STRIP_NAME) {
 		saved_namelen = ce_namelen(ce);
 		ce->ce_namelen = 0;
+		stripped_name = 1;
 	}
 
 	if (ce->ce_flags & CE_EXTENDED)
@@ -2149,7 +2158,7 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
 		strbuf_splice(previous_name, common, to_remove,
 			      ce->name + common, ce_namelen(ce) - common);
 	}
-	if (ce->ce_flags & CE_STRIP_NAME) {
+	if (stripped_name) {
 		ce->ce_namelen = saved_namelen;
 		ce->ce_flags &= ~CE_STRIP_NAME;
 	}
@@ -2166,7 +2175,7 @@ static int verify_index_from(const struct index_state *istate, const char *path)
 	int fd;
 	ssize_t n;
 	struct stat st;
-	unsigned char sha1[20];
+	unsigned char hash[GIT_MAX_RAWSZ];
 
 	if (!istate->initialized)
 		return 0;
@@ -2178,14 +2187,14 @@ static int verify_index_from(const struct index_state *istate, const char *path)
 	if (fstat(fd, &st))
 		goto out;
 
-	if (st.st_size < sizeof(struct cache_header) + 20)
+	if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
 		goto out;
 
-	n = pread_in_full(fd, sha1, 20, st.st_size - 20);
-	if (n != 20)
+	n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz);
+	if (n != the_hash_algo->rawsz)
 		goto out;
 
-	if (hashcmp(istate->sha1, sha1))
+	if (hashcmp(istate->sha1, hash))
 		goto out;
 
 	close(fd);
@@ -2233,8 +2242,9 @@ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile
 static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 			  int strip_extensions)
 {
+	uint64_t start = getnanotime();
 	int newfd = tempfile->fd;
-	git_SHA_CTX c;
+	git_hash_ctx c;
 	struct cache_header hdr;
 	int i, err = 0, removed, extended, hdr_version;
 	struct cache_entry **cache = istate->cache;
@@ -2272,7 +2282,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	hdr.hdr_version = htonl(hdr_version);
 	hdr.hdr_entries = htonl(entries - removed);
 
-	git_SHA1_Init(&c);
+	the_hash_algo->init_fn(&c);
 	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
 		return -1;
 
@@ -2373,6 +2383,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		return -1;
 	istate->timestamp.sec = (unsigned int)st.st_mtime;
 	istate->timestamp.nsec = ST_MTIME_NSEC(st);
+	trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);
 	return 0;
 }
 
@@ -2531,6 +2542,12 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
 	int new_shared_index, ret;
 	struct split_index *si = istate->split_index;
 
+	if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) {
+		if (flags & COMMIT_LOCK)
+			rollback_lock_file(lock);
+		return 0;
+	}
+
 	if (istate->fsmonitor_last_update)
 		fill_fsmonitor_bitmap(istate);
 
@@ -2676,7 +2693,7 @@ void *read_blob_data_from_index(const struct index_state *istate,
 	}
 	if (pos < 0)
 		return NULL;
-	data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz);
+	data = read_object_file(&istate->cache[pos]->oid, &type, &sz);
 	if (!data || type != OBJ_BLOB) {
 		free(data);
 		return NULL;
diff --git a/ref-filter.c b/ref-filter.c
index f9e25ae..9a333e2 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -529,12 +529,12 @@ static void end_align_handler(struct ref_formatting_stack **stack)
 
 static void align_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
 {
-	struct ref_formatting_stack *new;
+	struct ref_formatting_stack *new_stack;
 
 	push_stack_element(&state->stack);
-	new = state->stack;
-	new->at_end = end_align_handler;
-	new->at_end_data = &atomv->atom->u.align;
+	new_stack = state->stack;
+	new_stack->at_end = end_align_handler;
+	new_stack->at_end_data = &atomv->atom->u.align;
 }
 
 static void if_then_else_handler(struct ref_formatting_stack **stack)
@@ -574,16 +574,16 @@ static void if_then_else_handler(struct ref_formatting_stack **stack)
 
 static void if_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
 {
-	struct ref_formatting_stack *new;
+	struct ref_formatting_stack *new_stack;
 	struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
 
 	if_then_else->str = atomv->atom->u.if_then_else.str;
 	if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
 
 	push_stack_element(&state->stack);
-	new = state->stack;
-	new->at_end = if_then_else_handler;
-	new->at_end_data = if_then_else;
+	new_stack = state->stack;
+	new_stack->at_end = if_then_else_handler;
+	new_stack->at_end_data = if_then_else;
 }
 
 static int is_empty(const char *s)
@@ -728,7 +728,7 @@ int verify_ref_format(struct ref_format *format)
 static void *get_obj(const struct object_id *oid, struct object **obj, unsigned long *sz, int *eaten)
 {
 	enum object_type type;
-	void *buf = read_sha1_file(oid->hash, &type, sz);
+	void *buf = read_object_file(oid, &type, sz);
 
 	if (buf)
 		*obj = parse_object_buffer(oid, type, *sz, buf, eaten);
@@ -737,18 +737,18 @@ static void *get_obj(const struct object_id *oid, struct object **obj, unsigned
 	return buf;
 }
 
-static int grab_objectname(const char *name, const unsigned char *sha1,
+static int grab_objectname(const char *name, const struct object_id *oid,
 			   struct atom_value *v, struct used_atom *atom)
 {
 	if (starts_with(name, "objectname")) {
 		if (atom->u.objectname.option == O_SHORT) {
-			v->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+			v->s = xstrdup(find_unique_abbrev(oid, DEFAULT_ABBREV));
 			return 1;
 		} else if (atom->u.objectname.option == O_FULL) {
-			v->s = xstrdup(sha1_to_hex(sha1));
+			v->s = xstrdup(oid_to_hex(oid));
 			return 1;
 		} else if (atom->u.objectname.option == O_LENGTH) {
-			v->s = xstrdup(find_unique_abbrev(sha1, atom->u.objectname.length));
+			v->s = xstrdup(find_unique_abbrev(oid, atom->u.objectname.length));
 			return 1;
 		} else
 			die("BUG: unknown %%(objectname) option");
@@ -769,13 +769,13 @@ static void grab_common_values(struct atom_value *val, int deref, struct object
 		if (deref)
 			name++;
 		if (!strcmp(name, "objecttype"))
-			v->s = typename(obj->type);
+			v->s = type_name(obj->type);
 		else if (!strcmp(name, "objectsize")) {
 			v->value = sz;
 			v->s = xstrfmt("%lu", sz);
 		}
 		else if (deref)
-			grab_objectname(name, obj->oid.hash, v, &used_atom[i]);
+			grab_objectname(name, &obj->oid, v, &used_atom[i]);
 	}
 }
 
@@ -795,7 +795,7 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob
 		if (!strcmp(name, "tag"))
 			v->s = tag->tag;
 		else if (!strcmp(name, "type") && tag->tagged)
-			v->s = typename(tag->tagged->type);
+			v->s = type_name(tag->tagged->type);
 		else if (!strcmp(name, "object") && tag->tagged)
 			v->s = xstrdup(oid_to_hex(&tag->tagged->oid));
 	}
@@ -1249,8 +1249,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
 	if (atom->u.remote_ref.option == RR_REF)
 		*s = show_ref(&atom->u.remote_ref.refname, refname);
 	else if (atom->u.remote_ref.option == RR_TRACK) {
-		if (stat_tracking_info(branch, &num_ours,
-				       &num_theirs, NULL)) {
+		if (stat_tracking_info(branch, &num_ours, &num_theirs,
+				       NULL, AHEAD_BEHIND_FULL) < 0) {
 			*s = xstrdup(msgs.gone);
 		} else if (!num_ours && !num_theirs)
 			*s = "";
@@ -1267,8 +1267,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
 			free((void *)to_free);
 		}
 	} else if (atom->u.remote_ref.option == RR_TRACKSHORT) {
-		if (stat_tracking_info(branch, &num_ours,
-				       &num_theirs, NULL))
+		if (stat_tracking_info(branch, &num_ours, &num_theirs,
+				       NULL, AHEAD_BEHIND_FULL) < 0)
 			return;
 
 		if (!num_ours && !num_theirs)
@@ -1354,15 +1354,31 @@ static const char *get_refname(struct used_atom *atom, struct ref_array_item *re
 	return show_ref(&atom->u.refname, ref->refname);
 }
 
+static void get_object(struct ref_array_item *ref, const struct object_id *oid,
+		       int deref, struct object **obj)
+{
+	int eaten;
+	unsigned long size;
+	void *buf = get_obj(oid, obj, &size, &eaten);
+	if (!buf)
+		die(_("missing object %s for %s"),
+		    oid_to_hex(oid), ref->refname);
+	if (!*obj)
+		die(_("parse_object_buffer failed on %s for %s"),
+		    oid_to_hex(oid), ref->refname);
+
+	grab_values(ref->value, deref, *obj, buf, size);
+	if (!eaten)
+		free(buf);
+}
+
 /*
  * Parse the object referred by ref, and grab needed value.
  */
 static void populate_value(struct ref_array_item *ref)
 {
-	void *buf;
 	struct object *obj;
-	int eaten, i;
-	unsigned long size;
+	int i;
 	const struct object_id *tagged;
 
 	ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
@@ -1439,7 +1455,7 @@ static void populate_value(struct ref_array_item *ref)
 				v->s = xstrdup(buf + 1);
 			}
 			continue;
-		} else if (!deref && grab_objectname(name, ref->objectname.hash, v, atom)) {
+		} else if (!deref && grab_objectname(name, &ref->objectname, v, atom)) {
 			continue;
 		} else if (!strcmp(name, "HEAD")) {
 			if (atom->u.head && !strcmp(ref->refname, atom->u.head))
@@ -1478,22 +1494,12 @@ static void populate_value(struct ref_array_item *ref)
 	for (i = 0; i < used_atom_cnt; i++) {
 		struct atom_value *v = &ref->value[i];
 		if (v->s == NULL)
-			goto need_obj;
+			break;
 	}
-	return;
-
- need_obj:
-	buf = get_obj(&ref->objectname, &obj, &size, &eaten);
-	if (!buf)
-		die(_("missing object %s for %s"),
-		    oid_to_hex(&ref->objectname), ref->refname);
-	if (!obj)
-		die(_("parse_object_buffer failed on %s for %s"),
-		    oid_to_hex(&ref->objectname), ref->refname);
+	if (used_atom_cnt <= i)
+		return;
 
-	grab_values(ref->value, 0, obj, buf, size);
-	if (!eaten)
-		free(buf);
+	get_object(ref, &ref->objectname, 0, &obj);
 
 	/*
 	 * If there is no atom that wants to know about tagged
@@ -1514,16 +1520,7 @@ static void populate_value(struct ref_array_item *ref)
 	 * is not consistent with what deref_tag() does
 	 * which peels the onion to the core.
 	 */
-	buf = get_obj(tagged, &obj, &size, &eaten);
-	if (!buf)
-		die(_("missing object %s for %s"),
-		    oid_to_hex(tagged), ref->refname);
-	if (!obj)
-		die(_("parse_object_buffer failed on %s for %s"),
-		    oid_to_hex(tagged), ref->refname);
-	grab_values(ref->value, 1, obj, buf, size);
-	if (!eaten)
-		free(buf);
+	get_object(ref, tagged, 1, &obj);
 }
 
 /*
diff --git a/refs.c b/refs.c
index 20ba82b..8b7a77f 100644
--- a/refs.c
+++ b/refs.c
@@ -301,7 +301,7 @@ enum peel_status peel_object(const struct object_id *name, struct object_id *oid
 	struct object *o = lookup_unknown_object(name->hash);
 
 	if (o->type == OBJ_NONE) {
-		int type = sha1_object_info(name->hash, NULL);
+		int type = oid_object_info(name, NULL);
 		if (type < 0 || !object_as_type(o, type, 0))
 			return PEEL_INVALID;
 	}
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 023243f..65288c6 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -68,17 +68,21 @@ struct snapshot {
 	int mmapped;
 
 	/*
-	 * The contents of the `packed-refs` file. If the file was
-	 * already sorted, this points at the mmapped contents of the
-	 * file. If not, this points at heap-allocated memory
-	 * containing the contents, sorted. If there were no contents
-	 * (e.g., because the file didn't exist), `buf` and `eof` are
-	 * both NULL.
+	 * The contents of the `packed-refs` file:
+	 *
+	 * - buf -- a pointer to the start of the memory
+	 * - start -- a pointer to the first byte of actual references
+	 *   (i.e., after the header line, if one is present)
+	 * - eof -- a pointer just past the end of the reference
+	 *   contents
+	 *
+	 * If the `packed-refs` file was already sorted, `buf` points
+	 * at the mmapped contents of the file. If not, it points at
+	 * heap-allocated memory containing the contents, sorted. If
+	 * there were no contents (e.g., because the file didn't
+	 * exist), `buf`, `start`, and `eof` are all NULL.
 	 */
-	char *buf, *eof;
-
-	/* The size of the header line, if any; otherwise, 0: */
-	size_t header_len;
+	char *buf, *start, *eof;
 
 	/*
 	 * What is the peeled state of the `packed-refs` file that
@@ -169,8 +173,7 @@ static void clear_snapshot_buffer(struct snapshot *snapshot)
 	} else {
 		free(snapshot->buf);
 	}
-	snapshot->buf = snapshot->eof = NULL;
-	snapshot->header_len = 0;
+	snapshot->buf = snapshot->start = snapshot->eof = NULL;
 }
 
 /*
@@ -319,13 +322,14 @@ static void sort_snapshot(struct snapshot *snapshot)
 	size_t len, i;
 	char *new_buffer, *dst;
 
-	pos = snapshot->buf + snapshot->header_len;
+	pos = snapshot->start;
 	eof = snapshot->eof;
-	len = eof - pos;
 
-	if (!len)
+	if (pos == eof)
 		return;
 
+	len = eof - pos;
+
 	/*
 	 * Initialize records based on a crude estimate of the number
 	 * of references in the file (we'll grow it below if needed):
@@ -391,9 +395,8 @@ static void sort_snapshot(struct snapshot *snapshot)
 	 * place:
 	 */
 	clear_snapshot_buffer(snapshot);
-	snapshot->buf = new_buffer;
+	snapshot->buf = snapshot->start = new_buffer;
 	snapshot->eof = new_buffer + len;
-	snapshot->header_len = 0;
 
 cleanup:
 	free(records);
@@ -442,23 +445,26 @@ static const char *find_end_of_record(const char *p, const char *end)
  */
 static void verify_buffer_safe(struct snapshot *snapshot)
 {
-	const char *buf = snapshot->buf + snapshot->header_len;
+	const char *start = snapshot->start;
 	const char *eof = snapshot->eof;
 	const char *last_line;
 
-	if (buf == eof)
+	if (start == eof)
 		return;
 
-	last_line = find_start_of_record(buf, eof - 1);
+	last_line = find_start_of_record(start, eof - 1);
 	if (*(eof - 1) != '\n' || eof - last_line < GIT_SHA1_HEXSZ + 2)
 		die_invalid_line(snapshot->refs->path,
 				 last_line, eof - last_line);
 }
 
+#define SMALL_FILE_SIZE (32*1024)
+
 /*
  * Depending on `mmap_strategy`, either mmap or read the contents of
  * the `packed-refs` file into the snapshot. Return 1 if the file
- * existed and was read, or 0 if the file was absent. Die on errors.
+ * existed and was read, or 0 if the file was absent or empty. Die on
+ * errors.
  */
 static int load_contents(struct snapshot *snapshot)
 {
@@ -489,24 +495,23 @@ static int load_contents(struct snapshot *snapshot)
 		die_errno("couldn't stat %s", snapshot->refs->path);
 	size = xsize_t(st.st_size);
 
-	switch (mmap_strategy) {
-	case MMAP_NONE:
+	if (!size) {
+		return 0;
+	} else if (mmap_strategy == MMAP_NONE || size <= SMALL_FILE_SIZE) {
 		snapshot->buf = xmalloc(size);
 		bytes_read = read_in_full(fd, snapshot->buf, size);
 		if (bytes_read < 0 || bytes_read != size)
 			die_errno("couldn't read %s", snapshot->refs->path);
-		snapshot->eof = snapshot->buf + size;
 		snapshot->mmapped = 0;
-		break;
-	case MMAP_TEMPORARY:
-	case MMAP_OK:
+	} else {
 		snapshot->buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
-		snapshot->eof = snapshot->buf + size;
 		snapshot->mmapped = 1;
-		break;
 	}
 	close(fd);
 
+	snapshot->start = snapshot->buf;
+	snapshot->eof = snapshot->buf + size;
+
 	return 1;
 }
 
@@ -515,9 +520,11 @@ static int load_contents(struct snapshot *snapshot)
  * `refname` starts. If `mustexist` is true and the reference doesn't
  * exist, then return NULL. If `mustexist` is false and the reference
  * doesn't exist, then return the point where that reference would be
- * inserted. In the latter mode, `refname` doesn't have to be a proper
- * reference name; for example, one could search for "refs/replace/"
- * to find the start of any replace references.
+ * inserted, or `snapshot->eof` (which might be NULL) if it would be
+ * inserted at the end of the file. In the latter mode, `refname`
+ * doesn't have to be a proper reference name; for example, one could
+ * search for "refs/replace/" to find the start of any replace
+ * references.
  *
  * The record is sought using a binary search, so `snapshot->buf` must
  * be sorted.
@@ -539,7 +546,7 @@ static const char *find_reference_location(struct snapshot *snapshot,
 	 * preceding records all have reference names that come
 	 * *before* `refname`.
 	 */
-	const char *lo = snapshot->buf + snapshot->header_len;
+	const char *lo = snapshot->start;
 
 	/*
 	 * A pointer to a the first character of a record whose
@@ -547,7 +554,7 @@ static const char *find_reference_location(struct snapshot *snapshot,
 	 */
 	const char *hi = snapshot->eof;
 
-	while (lo < hi) {
+	while (lo != hi) {
 		const char *mid, *rec;
 		int cmp;
 
@@ -616,9 +623,7 @@ static struct snapshot *create_snapshot(struct packed_ref_store *refs)
 
 	/* If the file has a header line, process it: */
 	if (snapshot->buf < snapshot->eof && *snapshot->buf == '#') {
-		struct strbuf tmp = STRBUF_INIT;
-		char *p;
-		const char *eol;
+		char *tmp, *p, *eol;
 		struct string_list traits = STRING_LIST_INIT_NODUP;
 
 		eol = memchr(snapshot->buf, '\n',
@@ -628,9 +633,9 @@ static struct snapshot *create_snapshot(struct packed_ref_store *refs)
 					      snapshot->buf,
 					      snapshot->eof - snapshot->buf);
 
-		strbuf_add(&tmp, snapshot->buf, eol - snapshot->buf);
+		tmp = xmemdupz(snapshot->buf, eol - snapshot->buf);
 
-		if (!skip_prefix(tmp.buf, "# pack-refs with:", (const char **)&p))
+		if (!skip_prefix(tmp, "# pack-refs with:", (const char **)&p))
 			die_invalid_line(refs->path,
 					 snapshot->buf,
 					 snapshot->eof - snapshot->buf);
@@ -647,10 +652,10 @@ static struct snapshot *create_snapshot(struct packed_ref_store *refs)
 		/* perhaps other traits later as well */
 
 		/* The "+ 1" is for the LF character. */
-		snapshot->header_len = eol + 1 - snapshot->buf;
+		snapshot->start = eol + 1;
 
 		string_list_clear(&traits, 0);
-		strbuf_release(&tmp);
+		free(tmp);
 	}
 
 	verify_buffer_safe(snapshot);
@@ -671,13 +676,12 @@ static struct snapshot *create_snapshot(struct packed_ref_store *refs)
 		 * We don't want to leave the file mmapped, so we are
 		 * forced to make a copy now:
 		 */
-		size_t size = snapshot->eof -
-			(snapshot->buf + snapshot->header_len);
+		size_t size = snapshot->eof - snapshot->start;
 		char *buf_copy = xmalloc(size);
 
-		memcpy(buf_copy, snapshot->buf + snapshot->header_len, size);
+		memcpy(buf_copy, snapshot->start, size);
 		clear_snapshot_buffer(snapshot);
-		snapshot->buf = buf_copy;
+		snapshot->buf = snapshot->start = buf_copy;
 		snapshot->eof = buf_copy + size;
 	}
 
@@ -924,7 +928,12 @@ static struct ref_iterator *packed_ref_iterator_begin(
 	 */
 	snapshot = get_snapshot(refs);
 
-	if (!snapshot->buf)
+	if (prefix && *prefix)
+		start = find_reference_location(snapshot, prefix, 0);
+	else
+		start = snapshot->start;
+
+	if (start == snapshot->eof)
 		return empty_ref_iterator_begin();
 
 	iter = xcalloc(1, sizeof(*iter));
@@ -934,11 +943,6 @@ static struct ref_iterator *packed_ref_iterator_begin(
 	iter->snapshot = snapshot;
 	acquire_snapshot(snapshot);
 
-	if (prefix && *prefix)
-		start = find_reference_location(snapshot, prefix, 0);
-	else
-		start = snapshot->buf + snapshot->header_len;
-
 	iter->pos = start;
 	iter->eof = snapshot->eof;
 	strbuf_init(&iter->refname_buf, 0);
diff --git a/remote-curl.c b/remote-curl.c
index 6ec5352..a7c4c9b 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -13,6 +13,7 @@
 #include "credential.h"
 #include "sha1-array.h"
 #include "send-pack.h"
+#include "quote.h"
 
 static struct remote *remote;
 /* always ends with a trailing slash */
@@ -145,7 +146,15 @@ static int set_option(const char *name, const char *value)
 			return -1;
 		return 0;
 	} else if (!strcmp(name, "push-option")) {
-		string_list_append(&options.push_options, value);
+		if (*value != '"')
+			string_list_append(&options.push_options, value);
+		else {
+			struct strbuf unquoted = STRBUF_INIT;
+			if (unquote_c_style(&unquoted, value, NULL) < 0)
+				die("invalid quoting in push-option value");
+			string_list_append_nodup(&options.push_options,
+						 strbuf_detach(&unquoted, NULL));
+		}
 		return 0;
 
 #if LIBCURL_VERSION_NUM >= 0x070a08
@@ -351,6 +360,8 @@ static struct discovery *discover_refs(const char *service, int for_push)
 		 * pkt-line matches our request.
 		 */
 		line = packet_read_line_buf(&last->buf, &last->len, NULL);
+		if (!line)
+			die("invalid server response; expected service, got flush packet");
 
 		strbuf_reset(&exp);
 		strbuf_addf(&exp, "# service=%s", service);
diff --git a/remote-testsvn.c b/remote-testsvn.c
index bcebb4c..c4bb9a8 100644
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -61,7 +61,7 @@ static char *read_ref_note(const struct object_id *oid)
 	init_notes(NULL, notes_ref, NULL, 0);
 	if (!(note_oid = get_note(NULL, oid)))
 		return NULL;	/* note tree not found */
-	if (!(msg = read_sha1_file(note_oid->hash, &type, &msglen)))
+	if (!(msg = read_object_file(note_oid, &type, &msglen)))
 		error("Empty notes tree. %s", notes_ref);
 	else if (!msglen || type != OBJ_BLOB) {
 		error("Note contains unusable content. "
@@ -108,7 +108,7 @@ static int note2mark_cb(const struct object_id *object_oid,
 	enum object_type type;
 	struct rev_note note;
 
-	if (!(msg = read_sha1_file(note_oid->hash, &type, &msglen)) ||
+	if (!(msg = read_object_file(note_oid, &type, &msglen)) ||
 			!msglen || type != OBJ_BLOB) {
 		free(msg);
 		return 1;
diff --git a/remote.c b/remote.c
index 4e93753..91eb010 100644
--- a/remote.c
+++ b/remote.c
@@ -22,6 +22,7 @@ static struct refspec s_tag_refspec = {
 	"refs/tags/*"
 };
 
+/* See TAG_REFSPEC for the string version */
 const struct refspec *tag_refspec = &s_tag_refspec;
 
 struct counted_string {
@@ -103,6 +104,17 @@ static void add_fetch_refspec(struct remote *remote, const char *ref)
 	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
 }
 
+void add_prune_tags_to_fetch_refspec(struct remote *remote)
+{
+	int nr = remote->fetch_refspec_nr;
+	int bufsize = nr  + 1;
+	int size = sizeof(struct refspec);
+
+	remote->fetch = xrealloc(remote->fetch, size  * bufsize);
+	memcpy(&remote->fetch[nr], tag_refspec, size);
+	add_fetch_refspec(remote, xstrdup(TAG_REFSPEC));
+}
+
 static void add_url(struct remote *remote, const char *url)
 {
 	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
@@ -173,6 +185,7 @@ static struct remote *make_remote(const char *name, int len)
 
 	ret = xcalloc(1, sizeof(struct remote));
 	ret->prune = -1;  /* unspecified */
+	ret->prune_tags = -1;  /* unspecified */
 	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
 	remotes[remotes_nr++] = ret;
 	ret->name = xstrndup(name, len);
@@ -391,6 +404,8 @@ static int handle_config(const char *key, const char *value, void *cb)
 		remote->skip_default_update = git_config_bool(key, value);
 	else if (!strcmp(subkey, "prune"))
 		remote->prune = git_config_bool(key, value);
+	else if (!strcmp(subkey, "prunetags"))
+		remote->prune_tags = git_config_bool(key, value);
 	else if (!strcmp(subkey, "url")) {
 		const char *v;
 		if (git_config_string(&v, key, value))
@@ -1361,7 +1376,7 @@ static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***ds
 			continue; /* not a tag */
 		if (string_list_has_string(&dst_tag, ref->name))
 			continue; /* they already have it */
-		if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
+		if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)
 			continue; /* be conservative */
 		item = string_list_append(&src_tag, ref->name);
 		item->util = ref;
@@ -1970,33 +1985,33 @@ static void unmark_and_free(struct commit_list *list, unsigned int mark)
 int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
 {
 	struct object *o;
-	struct commit *old, *new;
+	struct commit *old_commit, *new_commit;
 	struct commit_list *list, *used;
 	int found = 0;
 
 	/*
-	 * Both new and old must be commit-ish and new is descendant of
-	 * old.  Otherwise we require --force.
+	 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
+	 * old_commit.  Otherwise we require --force.
 	 */
 	o = deref_tag(parse_object(old_oid), NULL, 0);
 	if (!o || o->type != OBJ_COMMIT)
 		return 0;
-	old = (struct commit *) o;
+	old_commit = (struct commit *) o;
 
 	o = deref_tag(parse_object(new_oid), NULL, 0);
 	if (!o || o->type != OBJ_COMMIT)
 		return 0;
-	new = (struct commit *) o;
+	new_commit = (struct commit *) o;
 
-	if (parse_commit(new) < 0)
+	if (parse_commit(new_commit) < 0)
 		return 0;
 
 	used = list = NULL;
-	commit_list_insert(new, &list);
+	commit_list_insert(new_commit, &list);
 	while (list) {
-		new = pop_most_recent_commit(&list, TMP_MARK);
-		commit_list_insert(new, &used);
-		if (new == old) {
+		new_commit = pop_most_recent_commit(&list, TMP_MARK);
+		commit_list_insert(new_commit, &used);
+		if (new_commit == old_commit) {
 			found = 1;
 			break;
 		}
@@ -2007,16 +2022,23 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
 }
 
 /*
- * Compare a branch with its upstream, and save their differences (number
- * of commits) in *num_ours and *num_theirs. The name of the upstream branch
- * (or NULL if no upstream is defined) is returned via *upstream_name, if it
- * is not itself NULL.
+ * Lookup the upstream branch for the given branch and if present, optionally
+ * compute the commit ahead/behind values for the pair.
+ *
+ * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
+ * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
+ * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
+ * set to zero).
+ *
+ * The name of the upstream branch (or NULL if no upstream is defined) is
+ * returned via *upstream_name, if it is not itself NULL.
  *
  * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
- * upstream defined, or ref does not exist), 0 otherwise.
+ * upstream defined, or ref does not exist).  Returns 0 if the commits are
+ * identical.  Returns 1 if commits are different.
  */
 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
-		       const char **upstream_name)
+		       const char **upstream_name, enum ahead_behind_flags abf)
 {
 	struct object_id oid;
 	struct commit *ours, *theirs;
@@ -2044,11 +2066,15 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
 	if (!ours)
 		return -1;
 
+	*num_theirs = *num_ours = 0;
+
 	/* are we the same? */
-	if (theirs == ours) {
-		*num_theirs = *num_ours = 0;
+	if (theirs == ours)
 		return 0;
-	}
+	if (abf == AHEAD_BEHIND_QUICK)
+		return 1;
+	if (abf != AHEAD_BEHIND_FULL)
+		BUG("stat_tracking_info: invalid abf '%d'", abf);
 
 	/* Run "rev-list --left-right ours...theirs" internally... */
 	argv_array_push(&argv, ""); /* ignored */
@@ -2064,8 +2090,6 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
 		die("revision walk setup failed");
 
 	/* ... and count the commits on each side. */
-	*num_ours = 0;
-	*num_theirs = 0;
 	while (1) {
 		struct commit *c = get_revision(&revs);
 		if (!c)
@@ -2081,20 +2105,22 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
 	clear_commit_marks(theirs, ALL_REV_FLAGS);
 
 	argv_array_clear(&argv);
-	return 0;
+	return 1;
 }
 
 /*
  * Return true when there is anything to report, otherwise false.
  */
-int format_tracking_info(struct branch *branch, struct strbuf *sb)
+int format_tracking_info(struct branch *branch, struct strbuf *sb,
+			 enum ahead_behind_flags abf)
 {
-	int ours, theirs;
+	int ours, theirs, sti;
 	const char *full_base;
 	char *base;
 	int upstream_is_gone = 0;
 
-	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
+	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
+	if (sti < 0) {
 		if (!full_base)
 			return 0;
 		upstream_is_gone = 1;
@@ -2108,10 +2134,17 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
 		if (advice_status_hints)
 			strbuf_addstr(sb,
 				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
-	} else if (!ours && !theirs) {
+	} else if (!sti) {
 		strbuf_addf(sb,
 			_("Your branch is up to date with '%s'.\n"),
 			base);
+	} else if (abf == AHEAD_BEHIND_QUICK) {
+		strbuf_addf(sb,
+			    _("Your branch and '%s' refer to different commits.\n"),
+			    base);
+		if (advice_status_hints)
+			strbuf_addf(sb, _("  (use \"%s\" for details)\n"),
+				    "git status --ahead-behind");
 	} else if (!theirs) {
 		strbuf_addf(sb,
 			Q_("Your branch is ahead of '%s' by %d commit.\n",
diff --git a/remote.h b/remote.h
index 1f6611b..f09c019 100644
--- a/remote.h
+++ b/remote.h
@@ -47,6 +47,7 @@ struct remote {
 	int skip_default_update;
 	int mirror;
 	int prune;
+	int prune_tags;
 
 	const char *receivepack;
 	const char *uploadpack;
@@ -257,10 +258,18 @@ enum match_refs_flags {
 	MATCH_REFS_FOLLOW_TAGS	= (1 << 3)
 };
 
+/* Flags for --ahead-behind option. */
+enum ahead_behind_flags {
+	AHEAD_BEHIND_UNSPECIFIED = -1,
+	AHEAD_BEHIND_QUICK       =  0,  /* just eq/neq reporting */
+	AHEAD_BEHIND_FULL        =  1,  /* traditional a/b reporting */
+};
+
 /* Reporting of tracking info */
 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
-		       const char **upstream_name);
-int format_tracking_info(struct branch *branch, struct strbuf *sb);
+		       const char **upstream_name, enum ahead_behind_flags abf);
+int format_tracking_info(struct branch *branch, struct strbuf *sb,
+			 enum ahead_behind_flags abf);
 
 struct ref *get_local_heads(void);
 /*
@@ -297,4 +306,8 @@ extern int parseopt_push_cas_option(const struct option *, const char *arg, int
 extern int is_empty_cas(const struct push_cas_option *);
 void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);
 
+#define TAG_REFSPEC "refs/tags/*:refs/tags/*"
+
+void add_prune_tags_to_fetch_refspec(struct remote *remote);
+
 #endif
diff --git a/replace_object.c b/replace_object.c
index 3e49965..3363573 100644
--- a/replace_object.c
+++ b/replace_object.c
@@ -8,8 +8,8 @@
  * sha1.
  */
 static struct replace_object {
-	unsigned char original[20];
-	unsigned char replacement[20];
+	struct object_id original;
+	struct object_id replacement;
 } **replace_object;
 
 static int replace_object_alloc, replace_object_nr;
@@ -17,7 +17,7 @@ static int replace_object_alloc, replace_object_nr;
 static const unsigned char *replace_sha1_access(size_t index, void *table)
 {
 	struct replace_object **replace = table;
-	return replace[index]->original;
+	return replace[index]->original.hash;
 }
 
 static int replace_object_pos(const unsigned char *sha1)
@@ -29,7 +29,7 @@ static int replace_object_pos(const unsigned char *sha1)
 static int register_replace_object(struct replace_object *replace,
 				   int ignore_dups)
 {
-	int pos = replace_object_pos(replace->original);
+	int pos = replace_object_pos(replace->original.hash);
 
 	if (0 <= pos) {
 		if (ignore_dups)
@@ -59,14 +59,14 @@ static int register_replace_ref(const char *refname,
 	const char *hash = slash ? slash + 1 : refname;
 	struct replace_object *repl_obj = xmalloc(sizeof(*repl_obj));
 
-	if (strlen(hash) != 40 || get_sha1_hex(hash, repl_obj->original)) {
+	if (get_oid_hex(hash, &repl_obj->original)) {
 		free(repl_obj);
 		warning("bad replace ref name: %s", refname);
 		return 0;
 	}
 
 	/* Copy sha1 from the read ref */
-	hashcpy(repl_obj->replacement, oid->hash);
+	oidcpy(&repl_obj->replacement, oid);
 
 	/* Register new object */
 	if (register_replace_object(repl_obj, 1))
@@ -92,16 +92,16 @@ static void prepare_replace_object(void)
 #define MAXREPLACEDEPTH 5
 
 /*
- * If a replacement for object sha1 has been set up, return the
+ * If a replacement for object oid has been set up, return the
  * replacement object's name (replaced recursively, if necessary).
- * The return value is either sha1 or a pointer to a
+ * The return value is either oid or a pointer to a
  * permanently-allocated value.  This function always respects replace
  * references, regardless of the value of check_replace_refs.
  */
-const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
+const struct object_id *do_lookup_replace_object(const struct object_id *oid)
 {
 	int pos, depth = MAXREPLACEDEPTH;
-	const unsigned char *cur = sha1;
+	const struct object_id *cur = oid;
 
 	prepare_replace_object();
 
@@ -109,11 +109,11 @@ const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
 	do {
 		if (--depth < 0)
 			die("replace depth too high for object %s",
-			    sha1_to_hex(sha1));
+			    oid_to_hex(oid));
 
-		pos = replace_object_pos(cur);
+		pos = replace_object_pos(cur->hash);
 		if (0 <= pos)
-			cur = replace_object[pos]->replacement;
+			cur = &replace_object[pos]->replacement;
 	} while (0 <= pos);
 
 	return cur;
diff --git a/rerere.c b/rerere.c
index 79203c6..18cae2d 100644
--- a/rerere.c
+++ b/rerere.c
@@ -719,11 +719,9 @@ static void update_paths(struct string_list *update)
 			item->string);
 	}
 
-	if (active_cache_changed) {
-		if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
-			die("Unable to write new index file");
-	} else
-		rollback_lock_file(&index_lock);
+	if (write_locked_index(&the_index, &index_lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		die("Unable to write new index file");
 }
 
 static void remove_variant(struct rerere_id *id)
@@ -981,8 +979,8 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
 			break;
 		i = ce_stage(ce) - 1;
 		if (!mmfile[i].ptr) {
-			mmfile[i].ptr = read_sha1_file(ce->oid.hash, &type,
-						       &size);
+			mmfile[i].ptr = read_object_file(&ce->oid, &type,
+							 &size);
 			mmfile[i].size = size;
 		}
 	}
diff --git a/resolve-undo.c b/resolve-undo.c
index b40f317..aed95b4 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -24,7 +24,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
 	if (!lost->util)
 		lost->util = xcalloc(1, sizeof(*ui));
 	ui = lost->util;
-	hashcpy(ui->sha1[stage - 1], ce->oid.hash);
+	oidcpy(&ui->oid[stage - 1], &ce->oid);
 	ui->mode[stage - 1] = ce->ce_mode;
 }
 
@@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
 		for (i = 0; i < 3; i++) {
 			if (!ui->mode[i])
 				continue;
-			strbuf_add(sb, ui->sha1[i], 20);
+			strbuf_add(sb, ui->oid[i].hash, the_hash_algo->rawsz);
 		}
 	}
 }
@@ -55,6 +55,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
 	size_t len;
 	char *endptr;
 	int i;
+	const unsigned rawsz = the_hash_algo->rawsz;
 
 	resolve_undo = xcalloc(1, sizeof(*resolve_undo));
 	resolve_undo->strdup_strings = 1;
@@ -87,11 +88,11 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
 		for (i = 0; i < 3; i++) {
 			if (!ui->mode[i])
 				continue;
-			if (size < 20)
+			if (size < rawsz)
 				goto error;
-			hashcpy(ui->sha1[i], (const unsigned char *)data);
-			size -= 20;
-			data += 20;
+			memcpy(ui->oid[i].hash, (const unsigned char *)data, rawsz);
+			size -= rawsz;
+			data += rawsz;
 		}
 	}
 	return resolve_undo;
@@ -145,7 +146,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
 		struct cache_entry *nce;
 		if (!ru->mode[i])
 			continue;
-		nce = make_cache_entry(ru->mode[i], ru->sha1[i],
+		nce = make_cache_entry(ru->mode[i], ru->oid[i].hash,
 				       name, i + 1, 0);
 		if (matched)
 			nce->ce_flags |= CE_MATCHED;
diff --git a/resolve-undo.h b/resolve-undo.h
index 4630645..8729190 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -3,7 +3,7 @@
 
 struct resolve_undo_info {
 	unsigned int mode[3];
-	unsigned char sha1[3][20];
+	struct object_id oid[3];
 };
 
 extern void record_resolve_undo(struct index_state *, struct cache_entry *);
diff --git a/revision.c b/revision.c
index 5ce9b93..b42c836 100644
--- a/revision.c
+++ b/revision.c
@@ -113,7 +113,8 @@ void mark_parents_uninteresting(struct commit *commit)
 			 * it is popped next time around, we won't be trying
 			 * to parse it and get an error.
 			 */
-			if (!has_object_file(&commit->object.oid))
+			if (!commit->object.parsed &&
+			    !has_object_file(&commit->object.oid))
 				commit->object.parsed = 1;
 
 			if (commit->object.flags & UNINTERESTING)
@@ -1065,14 +1066,9 @@ static int limit_list(struct rev_info *revs)
 			return -1;
 		if (obj->flags & UNINTERESTING) {
 			mark_parents_uninteresting(commit);
-			if (revs->show_all)
-				p = &commit_list_insert(commit, p)->next;
 			slop = still_interesting(list, date, slop, &interesting_cache);
 			if (slop)
 				continue;
-			/* If showing all, add the whole pending list to the end */
-			if (revs->show_all)
-				*p = list;
 			break;
 		}
 		if (revs->min_age != -1 && (commit->date > revs->min_age))
@@ -1864,8 +1860,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->dense = 1;
 	} else if (!strcmp(arg, "--sparse")) {
 		revs->dense = 0;
-	} else if (!strcmp(arg, "--show-all")) {
-		revs->show_all = 1;
 	} else if (!strcmp(arg, "--in-commit-order")) {
 		revs->tree_blobs_in_commit_order = 1;
 	} else if (!strcmp(arg, "--remove-empty")) {
@@ -3094,8 +3088,6 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi
 		return commit_ignore;
 	if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
 		return commit_ignore;
-	if (revs->show_all)
-		return commit_show;
 	if (commit->object.flags & UNINTERESTING)
 		return commit_ignore;
 	if (revs->min_age != -1 &&
@@ -3194,7 +3186,6 @@ enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
 	enum commit_action action = get_commit_action(revs, commit);
 
 	if (action == commit_show &&
-	    !revs->show_all &&
 	    revs->prune && revs->dense && want_ancestry(revs)) {
 		/*
 		 * --full-diff on simplified parents is no good: it
diff --git a/revision.h b/revision.h
index 3dee97b..b8c47b9 100644
--- a/revision.h
+++ b/revision.h
@@ -90,7 +90,6 @@ struct rev_info {
 	unsigned int	dense:1,
 			prune:1,
 			no_walk:2,
-			show_all:1,
 			remove_empty_trees:1,
 			simplify_history:1,
 			topo_order:1,
diff --git a/run-command.c b/run-command.c
index a483d59..84899e4 100644
--- a/run-command.c
+++ b/run-command.c
@@ -621,7 +621,7 @@ static void trace_run_command(const struct child_process *cp)
 	if (!trace_want(&trace_default_key))
 		return;
 
-	strbuf_addf(&buf, "trace: run_command:");
+	strbuf_addstr(&buf, "trace: run_command:");
 	if (cp->dir) {
 		strbuf_addstr(&buf, " cd ");
 		sq_quote_buf_pretty(&buf, cp->dir);
diff --git a/send-pack.c b/send-pack.c
index 2112d3b..19025a7 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -37,14 +37,14 @@ int option_parse_push_signed(const struct option *opt,
 	die("bad %s argument: %s", opt->long_name, arg);
 }
 
-static void feed_object(const unsigned char *sha1, FILE *fh, int negative)
+static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 {
-	if (negative && !has_sha1_file(sha1))
+	if (negative && !has_sha1_file(oid->hash))
 		return;
 
 	if (negative)
 		putc('^', fh);
-	fputs(sha1_to_hex(sha1), fh);
+	fputs(oid_to_hex(oid), fh);
 	putc('\n', fh);
 }
 
@@ -89,13 +89,13 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
 	 */
 	po_in = xfdopen(po.in, "w");
 	for (i = 0; i < extra->nr; i++)
-		feed_object(extra->oid[i].hash, po_in, 1);
+		feed_object(&extra->oid[i], po_in, 1);
 
 	while (refs) {
 		if (!is_null_oid(&refs->old_oid))
-			feed_object(refs->old_oid.hash, po_in, 1);
+			feed_object(&refs->old_oid, po_in, 1);
 		if (!is_null_oid(&refs->new_oid))
-			feed_object(refs->new_oid.hash, po_in, 0);
+			feed_object(&refs->new_oid, po_in, 0);
 		refs = refs->next;
 	}
 
@@ -137,6 +137,8 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
 static int receive_unpack_status(int in)
 {
 	const char *line = packet_read_line(in, NULL);
+	if (!line)
+		return error(_("unexpected flush packet while reading remote unpack status"));
 	if (!skip_prefix(line, "unpack ", &line))
 		return error(_("unable to parse remote unpack status: %s"), line);
 	if (strcmp(line, "ok"))
diff --git a/sequencer.c b/sequencer.c
index 5bfdc40..667f35e 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -282,7 +282,7 @@ struct commit_message {
 
 static const char *short_commit_name(struct commit *commit)
 {
-	return find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
+	return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);
 }
 
 static int get_message(struct commit *commit, struct commit_message *out)
@@ -339,7 +339,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)
 static int write_message(const void *buf, size_t len, const char *filename,
 			 int append_eol)
 {
-	static struct lock_file msg_file;
+	struct lock_file msg_file = LOCK_INIT;
 
 	int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
 	if (msg_fd < 0)
@@ -352,10 +352,8 @@ static int write_message(const void *buf, size_t len, const char *filename,
 		rollback_lock_file(&msg_file);
 		return error_errno(_("could not write eol to '%s'"), filename);
 	}
-	if (commit_lock_file(&msg_file) < 0) {
-		rollback_lock_file(&msg_file);
-		return error(_("failed to finalize '%s'."), filename);
-	}
+	if (commit_lock_file(&msg_file) < 0)
+		return error(_("failed to finalize '%s'"), filename);
 
 	return 0;
 }
@@ -485,7 +483,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 	struct tree *result, *next_tree, *base_tree, *head_tree;
 	int clean;
 	char **xopt;
-	static struct lock_file index_lock;
+	struct lock_file index_lock = LOCK_INIT;
 
 	if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0)
 		return -1;
@@ -514,18 +512,19 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 		fputs(o.obuf.buf, stdout);
 	strbuf_release(&o.obuf);
 	diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
-	if (clean < 0)
+	if (clean < 0) {
+		rollback_lock_file(&index_lock);
 		return clean;
+	}
 
-	if (active_cache_changed &&
-	    write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
+	if (write_locked_index(&the_index, &index_lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		/*
 		 * TRANSLATORS: %s will be "revert", "cherry-pick" or
 		 * "rebase -i".
 		 */
 		return error(_("%s: Unable to write new index file"),
 			_(action_name(opts)));
-	rollback_lock_file(&index_lock);
 
 	if (!clean)
 		append_conflicts_hint(msgbuf);
@@ -1113,7 +1112,7 @@ static int try_to_commit(struct strbuf *msg, const char *author,
 		commit_list_insert(current_head, &parents);
 	}
 
-	if (write_cache_as_tree(tree.hash, 0, NULL)) {
+	if (write_cache_as_tree(&tree, 0, NULL)) {
 		res = error(_("git write-tree failed to write a tree"));
 		goto out;
 	}
@@ -1149,8 +1148,8 @@ static int try_to_commit(struct strbuf *msg, const char *author,
 		goto out;
 	}
 
-	if (commit_tree_extended(msg->buf, msg->len, tree.hash, parents,
-				 oid->hash, author, opts->gpg_sign, extra)) {
+	if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
+				 oid, author, opts->gpg_sign, extra)) {
 		res = error(_("failed to write commit object"));
 		goto out;
 	}
@@ -1475,7 +1474,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
 		 * that represents the "current" state for merge-recursive
 		 * to work on.
 		 */
-		if (write_cache_as_tree(head.hash, 0, NULL))
+		if (write_cache_as_tree(&head, 0, NULL))
 			return error(_("your index file is unmerged."));
 	} else {
 		unborn = get_oid("HEAD", &head);
@@ -1705,7 +1704,7 @@ static int prepare_revs(struct replay_opts *opts)
 
 static int read_and_refresh_cache(struct replay_opts *opts)
 {
-	static struct lock_file index_lock;
+	struct lock_file index_lock = LOCK_INIT;
 	int index_fd = hold_locked_index(&index_lock, 0);
 	if (read_index_preload(&the_index, NULL) < 0) {
 		rollback_lock_file(&index_lock);
@@ -1713,13 +1712,13 @@ static int read_and_refresh_cache(struct replay_opts *opts)
 			_(action_name(opts)));
 	}
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
-	if (the_index.cache_changed && index_fd >= 0) {
-		if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) {
+	if (index_fd >= 0) {
+		if (write_locked_index(&the_index, &index_lock,
+				       COMMIT_LOCK | SKIP_IF_UNCHANGED)) {
 			return error(_("git %s: failed to refresh the index"),
 				_(action_name(opts)));
 		}
 	}
-	rollback_lock_file(&index_lock);
 	return 0;
 }
 
@@ -1869,22 +1868,31 @@ static int count_commands(struct todo_list *todo_list)
 	return count;
 }
 
+static ssize_t strbuf_read_file_or_whine(struct strbuf *sb, const char *path)
+{
+	int fd;
+	ssize_t len;
+
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		return error_errno(_("could not open '%s'"), path);
+	len = strbuf_read(sb, fd, 0);
+	close(fd);
+	if (len < 0)
+		return error(_("could not read '%s'."), path);
+	return len;
+}
+
 static int read_populate_todo(struct todo_list *todo_list,
 			struct replay_opts *opts)
 {
 	struct stat st;
 	const char *todo_file = get_todo_path(opts);
-	int fd, res;
+	int res;
 
 	strbuf_reset(&todo_list->buf);
-	fd = open(todo_file, O_RDONLY);
-	if (fd < 0)
-		return error_errno(_("could not open '%s'"), todo_file);
-	if (strbuf_read(&todo_list->buf, fd, 0) < 0) {
-		close(fd);
-		return error(_("could not read '%s'."), todo_file);
-	}
-	close(fd);
+	if (strbuf_read_file_or_whine(&todo_list->buf, todo_file) < 0)
+		return -1;
 
 	res = stat(todo_file, &st);
 	if (res)
@@ -2099,16 +2107,14 @@ static int create_seq_dir(void)
 
 static int save_head(const char *head)
 {
-	static struct lock_file head_lock;
+	struct lock_file head_lock = LOCK_INIT;
 	struct strbuf buf = STRBUF_INIT;
 	int fd;
 	ssize_t written;
 
 	fd = hold_lock_file_for_update(&head_lock, git_path_head_file(), 0);
-	if (fd < 0) {
-		rollback_lock_file(&head_lock);
+	if (fd < 0)
 		return error_errno(_("could not lock HEAD"));
-	}
 	strbuf_addf(&buf, "%s\n", head);
 	written = write_in_full(fd, buf.buf, buf.len);
 	strbuf_release(&buf);
@@ -2117,10 +2123,8 @@ static int save_head(const char *head)
 		return error_errno(_("could not write to '%s'"),
 				   git_path_head_file());
 	}
-	if (commit_lock_file(&head_lock) < 0) {
-		rollback_lock_file(&head_lock);
-		return error(_("failed to finalize '%s'."), git_path_head_file());
-	}
+	if (commit_lock_file(&head_lock) < 0)
+		return error(_("failed to finalize '%s'"), git_path_head_file());
 	return 0;
 }
 
@@ -2224,7 +2228,7 @@ fail:
 
 static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
 {
-	static struct lock_file todo_lock;
+	struct lock_file todo_lock = LOCK_INIT;
 	const char *todo_path = get_todo_path(opts);
 	int next = todo_list->current, offset, fd;
 
@@ -2244,7 +2248,7 @@ static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
 			todo_list->buf.len - offset) < 0)
 		return error_errno(_("could not write to '%s'"), todo_path);
 	if (commit_lock_file(&todo_lock) < 0)
-		return error(_("failed to finalize '%s'."), todo_path);
+		return error(_("failed to finalize '%s'"), todo_path);
 
 	if (is_rebase_i(opts)) {
 		const char *done_path = rebase_path_done();
@@ -2314,6 +2318,9 @@ static int make_patch(struct commit *commit, struct replay_opts *opts)
 	p = short_commit_name(commit);
 	if (write_message(p, strlen(p), rebase_path_stopped_sha(), 1) < 0)
 		return -1;
+	if (update_ref("rebase", "REBASE_HEAD", &commit->object.oid,
+		       NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR))
+		res |= error(_("could not update %s"), "REBASE_HEAD");
 
 	strbuf_addf(&buf, "%s/patch", get_dir(opts));
 	memset(&log_tree_opt, 0, sizeof(log_tree_opt));
@@ -2565,6 +2572,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
 			unlink(rebase_path_author_script());
 			unlink(rebase_path_stopped_sha());
 			unlink(rebase_path_amend());
+			delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 		}
 		if (item->command <= TODO_SQUASH) {
 			if (is_rebase_i(opts))
@@ -2868,9 +2876,10 @@ int sequencer_pick_revisions(struct replay_opts *opts)
 
 		if (!get_oid(name, &oid)) {
 			if (!lookup_commit_reference_gently(&oid, 1)) {
-				enum object_type type = sha1_object_info(oid.hash, NULL);
+				enum object_type type = oid_object_info(&oid,
+									NULL);
 				return error(_("%s: can't cherry-pick a %s"),
-					name, typename(type));
+					name, type_name(type));
 			}
 		} else
 			return error(_("%s: bad revision"), name);
@@ -3151,20 +3160,13 @@ int check_todo_list(void)
 	struct strbuf todo_file = STRBUF_INIT;
 	struct todo_list todo_list = TODO_LIST_INIT;
 	struct strbuf missing = STRBUF_INIT;
-	int advise_to_edit_todo = 0, res = 0, fd, i;
+	int advise_to_edit_todo = 0, res = 0, i;
 
 	strbuf_addstr(&todo_file, rebase_path_todo());
-	fd = open(todo_file.buf, O_RDONLY);
-	if (fd < 0) {
-		res = error_errno(_("could not open '%s'"), todo_file.buf);
-		goto leave_check;
-	}
-	if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
-		close(fd);
-		res = error(_("could not read '%s'."), todo_file.buf);
+	if (strbuf_read_file_or_whine(&todo_list.buf, todo_file.buf) < 0) {
+		res = -1;
 		goto leave_check;
 	}
-	close(fd);
 	advise_to_edit_todo = res =
 		parse_insn_buffer(todo_list.buf.buf, &todo_list);
 
@@ -3180,17 +3182,10 @@ int check_todo_list(void)
 
 	todo_list_release(&todo_list);
 	strbuf_addstr(&todo_file, ".backup");
-	fd = open(todo_file.buf, O_RDONLY);
-	if (fd < 0) {
-		res = error_errno(_("could not open '%s'"), todo_file.buf);
-		goto leave_check;
-	}
-	if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
-		close(fd);
-		res = error(_("could not read '%s'."), todo_file.buf);
+	if (strbuf_read_file_or_whine(&todo_list.buf, todo_file.buf) < 0) {
+		res = -1;
 		goto leave_check;
 	}
-	close(fd);
 	strbuf_release(&todo_file);
 	res = !!parse_insn_buffer(todo_list.buf.buf, &todo_list);
 
@@ -3271,15 +3266,8 @@ int skip_unnecessary_picks(void)
 	}
 	strbuf_release(&buf);
 
-	fd = open(todo_file, O_RDONLY);
-	if (fd < 0) {
-		return error_errno(_("could not open '%s'"), todo_file);
-	}
-	if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
-		close(fd);
-		return error(_("could not read '%s'."), todo_file);
-	}
-	close(fd);
+	if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
+		return -1;
 	if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
 		todo_list_release(&todo_list);
 		return -1;
@@ -3370,17 +3358,11 @@ int rearrange_squash(void)
 	const char *todo_file = rebase_path_todo();
 	struct todo_list todo_list = TODO_LIST_INIT;
 	struct hashmap subject2item;
-	int res = 0, rearranged = 0, *next, *tail, fd, i;
+	int res = 0, rearranged = 0, *next, *tail, i;
 	char **subjects;
 
-	fd = open(todo_file, O_RDONLY);
-	if (fd < 0)
-		return error_errno(_("could not open '%s'"), todo_file);
-	if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
-		close(fd);
-		return error(_("could not read '%s'."), todo_file);
-	}
-	close(fd);
+	if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
+		return -1;
 	if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
 		todo_list_release(&todo_list);
 		return -1;
diff --git a/setup.c b/setup.c
index 6fac1bb..664453f 100644
--- a/setup.c
+++ b/setup.c
@@ -119,7 +119,7 @@ char *prefix_path(const char *prefix, int len, const char *path)
 {
 	char *r = prefix_path_gently(prefix, len, NULL, path);
 	if (!r)
-		die("'%s' is outside repository", path);
+		die(_("'%s' is outside repository"), path);
 	return r;
 }
 
@@ -160,7 +160,7 @@ int check_filename(const char *prefix, const char *arg)
 		free(to_free);
 		return 0; /* file does not exist */
 	}
-	die_errno("failed to stat '%s'", arg);
+	die_errno(_("failed to stat '%s'"), arg);
 }
 
 static void NORETURN die_verify_filename(const char *prefix,
@@ -230,7 +230,7 @@ void verify_filename(const char *prefix,
 		     int diagnose_misspelt_rev)
 {
 	if (*arg == '-')
-		die("option '%s' must come before non-option arguments", arg);
+		die(_("option '%s' must come before non-option arguments"), arg);
 	if (looks_like_pathspec(arg) || check_filename(prefix, arg))
 		return;
 	die_verify_filename(prefix, arg, diagnose_misspelt_rev);
@@ -385,14 +385,14 @@ void setup_work_tree(void)
 		return;
 
 	if (work_tree_config_is_bogus)
-		die("unable to set up work tree using invalid config");
+		die(_("unable to set up work tree using invalid config"));
 
 	work_tree = get_git_work_tree();
 	git_dir = get_git_dir();
 	if (!is_absolute_path(git_dir))
 		git_dir = real_path(get_git_dir());
 	if (!work_tree || chdir(work_tree))
-		die("This operation must be run in a work tree");
+		die(_("this operation must be run in a work tree"));
 
 	/*
 	 * Make sure subsequent git processes find correct worktree
@@ -530,17 +530,17 @@ void read_gitfile_error_die(int error_code, const char *path, const char *dir)
 		/* non-fatal; follow return path */
 		break;
 	case READ_GITFILE_ERR_OPEN_FAILED:
-		die_errno("Error opening '%s'", path);
+		die_errno(_("error opening '%s'"), path);
 	case READ_GITFILE_ERR_TOO_LARGE:
-		die("Too large to be a .git file: '%s'", path);
+		die(_("too large to be a .git file: '%s'"), path);
 	case READ_GITFILE_ERR_READ_FAILED:
-		die("Error reading %s", path);
+		die(_("error reading %s"), path);
 	case READ_GITFILE_ERR_INVALID_FORMAT:
-		die("Invalid gitfile format: %s", path);
+		die(_("invalid gitfile format: %s"), path);
 	case READ_GITFILE_ERR_NO_PATH:
-		die("No path in gitfile: %s", path);
+		die(_("no path in gitfile: %s"), path);
 	case READ_GITFILE_ERR_NOT_A_REPO:
-		die("Not a git repository: %s", dir);
+		die(_("not a git repository: %s"), dir);
 	default:
 		die("BUG: unknown error code");
 	}
@@ -639,7 +639,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 	int offset;
 
 	if (PATH_MAX - 40 < strlen(gitdirenv))
-		die("'$%s' too big", GIT_DIR_ENVIRONMENT);
+		die(_("'$%s' too big"), GIT_DIR_ENVIRONMENT);
 
 	gitfile = (char*)read_gitfile(gitdirenv);
 	if (gitfile) {
@@ -653,7 +653,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 			free(gitfile);
 			return NULL;
 		}
-		die("Not a git repository: '%s'", gitdirenv);
+		die(_("not a git repository: '%s'"), gitdirenv);
 	}
 
 	if (check_repository_format_gently(gitdirenv, repo_fmt, nongit_ok)) {
@@ -682,12 +682,12 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 		else {
 			char *core_worktree;
 			if (chdir(gitdirenv))
-				die_errno("Could not chdir to '%s'", gitdirenv);
+				die_errno(_("cannot chdir to '%s'"), gitdirenv);
 			if (chdir(git_work_tree_cfg))
-				die_errno("Could not chdir to '%s'", git_work_tree_cfg);
+				die_errno(_("cannot chdir to '%s'"), git_work_tree_cfg);
 			core_worktree = xgetcwd();
 			if (chdir(cwd->buf))
-				die_errno("Could not come back to cwd");
+				die_errno(_("cannot come back to cwd"));
 			set_git_work_tree(core_worktree);
 			free(core_worktree);
 		}
@@ -715,7 +715,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 	if (offset >= 0) {	/* cwd inside worktree? */
 		set_git_dir(real_path(gitdirenv));
 		if (chdir(worktree))
-			die_errno("Could not chdir to '%s'", worktree);
+			die_errno(_("cannot chdir to '%s'"), worktree);
 		strbuf_addch(cwd, '/');
 		free(gitfile);
 		return cwd->buf + offset;
@@ -743,7 +743,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
 		if (offset != cwd->len && !is_absolute_path(gitdir))
 			gitdir = to_free = real_pathdup(gitdir, 1);
 		if (chdir(cwd->buf))
-			die_errno("Could not come back to cwd");
+			die_errno(_("cannot come back to cwd"));
 		ret = setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
 		free(to_free);
 		return ret;
@@ -753,7 +753,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
 	if (is_bare_repository_cfg > 0) {
 		set_git_dir(offset == cwd->len ? gitdir : real_path(gitdir));
 		if (chdir(cwd->buf))
-			die_errno("Could not come back to cwd");
+			die_errno(_("cannot come back to cwd"));
 		return NULL;
 	}
 
@@ -792,7 +792,7 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
 
 		gitdir = offset == cwd->len ? "." : xmemdupz(cwd->buf, offset);
 		if (chdir(cwd->buf))
-			die_errno("Could not come back to cwd");
+			die_errno(_("cannot come back to cwd"));
 		return setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
 	}
 
@@ -800,7 +800,7 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
 	inside_work_tree = 0;
 	if (offset != cwd->len) {
 		if (chdir(cwd->buf))
-			die_errno("Cannot come back to cwd");
+			die_errno(_("cannot come back to cwd"));
 		root_len = offset_1st_component(cwd->buf);
 		strbuf_setlen(cwd, offset > root_len ? offset : root_len);
 		set_git_dir(cwd->buf);
@@ -813,9 +813,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
 static const char *setup_nongit(const char *cwd, int *nongit_ok)
 {
 	if (!nongit_ok)
-		die(_("Not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
+		die(_("not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
 	if (chdir(cwd))
-		die_errno(_("Cannot come back to cwd"));
+		die_errno(_("cannot come back to cwd"));
 	*nongit_ok = 1;
 	return NULL;
 }
@@ -824,7 +824,7 @@ static dev_t get_device_or_die(const char *path, const char *prefix, int prefix_
 {
 	struct stat buf;
 	if (stat(path, &buf)) {
-		die_errno("failed to stat '%*s%s%s'",
+		die_errno(_("failed to stat '%*s%s%s'"),
 				prefix_len,
 				prefix ? prefix : "",
 				prefix ? "/" : "", path);
@@ -1066,13 +1066,13 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		break;
 	case GIT_DIR_DISCOVERED:
 		if (dir.len < cwd.len && chdir(dir.buf))
-			die(_("Cannot change to '%s'"), dir.buf);
+			die(_("cannot change to '%s'"), dir.buf);
 		prefix = setup_discovered_git_dir(gitdir.buf, &cwd, dir.len,
 						  &repo_fmt, nongit_ok);
 		break;
 	case GIT_DIR_BARE:
 		if (dir.len < cwd.len && chdir(dir.buf))
-			die(_("Cannot change to '%s'"), dir.buf);
+			die(_("cannot change to '%s'"), dir.buf);
 		prefix = setup_bare_git_dir(&cwd, dir.len, &repo_fmt, nongit_ok);
 		break;
 	case GIT_DIR_HIT_CEILING:
@@ -1085,7 +1085,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 			strbuf_release(&dir);
 			return NULL;
 		}
-		die(_("Not a git repository (or any parent up to mount point %s)\n"
+		die(_("not a git repository (or any parent up to mount point %s)\n"
 		      "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),
 		    dir.buf);
 	default:
@@ -1168,7 +1168,7 @@ int git_config_perm(const char *var, const char *value)
 	/* A filemode value was given: 0xxx */
 
 	if ((i & 0600) != 0600)
-		die(_("Problem with core.sharedRepository filemode value "
+		die(_("problem with core.sharedRepository filemode value "
 		    "(0%.3o).\nThe owner of files must always have "
 		    "read and write permissions."), i);
 
@@ -1211,7 +1211,7 @@ void sanitize_stdfds(void)
 	while (fd != -1 && fd < 2)
 		fd = dup(fd);
 	if (fd == -1)
-		die_errno("open /dev/null or dup failed");
+		die_errno(_("open /dev/null or dup failed"));
 	if (fd > 2)
 		close(fd);
 }
@@ -1226,12 +1226,12 @@ int daemonize(void)
 		case 0:
 			break;
 		case -1:
-			die_errno("fork failed");
+			die_errno(_("fork failed"));
 		default:
 			exit(0);
 	}
 	if (setsid() == -1)
-		die_errno("setsid failed");
+		die_errno(_("setsid failed"));
 	close(0);
 	close(1);
 	close(2);
diff --git a/sha1-lookup.c b/sha1-lookup.c
index 4cf3ebd..8d0b1db 100644
--- a/sha1-lookup.c
+++ b/sha1-lookup.c
@@ -99,3 +99,31 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
 	} while (lo < hi);
 	return -lo-1;
 }
+
+int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+		 const unsigned char *table, size_t stride, uint32_t *result)
+{
+	uint32_t hi, lo;
+
+	hi = ntohl(fanout_nbo[*sha1]);
+	lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout_nbo[*sha1 - 1]));
+
+	while (lo < hi) {
+		unsigned mi = lo + (hi - lo) / 2;
+		int cmp = hashcmp(table + mi * stride, sha1);
+
+		if (!cmp) {
+			if (result)
+				*result = mi;
+			return 1;
+		}
+		if (cmp > 0)
+			hi = mi;
+		else
+			lo = mi + 1;
+	}
+
+	if (result)
+		*result = lo;
+	return 0;
+}
diff --git a/sha1-lookup.h b/sha1-lookup.h
index cf5314f..7678b23 100644
--- a/sha1-lookup.h
+++ b/sha1-lookup.h
@@ -7,4 +7,26 @@ extern int sha1_pos(const unsigned char *sha1,
 		    void *table,
 		    size_t nr,
 		    sha1_access_fn fn);
+
+/*
+ * Searches for sha1 in table, using the given fanout table to determine the
+ * interval to search, then using binary search. Returns 1 if found, 0 if not.
+ *
+ * Takes the following parameters:
+ *
+ *  - sha1: the hash to search for
+ *  - fanout_nbo: a 256-element array of NETWORK-order 32-bit integers; the
+ *    integer at position i represents the number of elements in table whose
+ *    first byte is less than or equal to i
+ *  - table: a sorted list of hashes with optional extra information in between
+ *  - stride: distance between two consecutive elements in table (should be
+ *    GIT_MAX_RAWSZ or greater)
+ *  - result: if not NULL, this function stores the element index of the
+ *    position found (if the search is successful) or the index of the least
+ *    element that is greater than sha1 (if the search is not successful)
+ *
+ * This function does not verify the validity of the fanout table.
+ */
+int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+		 const unsigned char *table, size_t stride, uint32_t *result);
 #endif
diff --git a/sha1_file.c b/sha1_file.c
index 0989bbd..aab3b58 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -32,6 +32,9 @@
 #include "fetch-object.h"
 #include "object-store.h"
 
+/* The maximum size for an object header. */
+#define MAX_HEADER_LEN 32
+
 const unsigned char null_sha1[GIT_MAX_RAWSZ];
 const struct object_id null_oid;
 const struct object_id empty_tree_oid = {
@@ -41,32 +44,32 @@ const struct object_id empty_blob_oid = {
 	EMPTY_BLOB_SHA1_BIN_LITERAL
 };
 
-static void git_hash_sha1_init(void *ctx)
+static void git_hash_sha1_init(git_hash_ctx *ctx)
 {
-	git_SHA1_Init((git_SHA_CTX *)ctx);
+	git_SHA1_Init(&ctx->sha1);
 }
 
-static void git_hash_sha1_update(void *ctx, const void *data, size_t len)
+static void git_hash_sha1_update(git_hash_ctx *ctx, const void *data, size_t len)
 {
-	git_SHA1_Update((git_SHA_CTX *)ctx, data, len);
+	git_SHA1_Update(&ctx->sha1, data, len);
 }
 
-static void git_hash_sha1_final(unsigned char *hash, void *ctx)
+static void git_hash_sha1_final(unsigned char *hash, git_hash_ctx *ctx)
 {
-	git_SHA1_Final(hash, (git_SHA_CTX *)ctx);
+	git_SHA1_Final(hash, &ctx->sha1);
 }
 
-static void git_hash_unknown_init(void *ctx)
+static void git_hash_unknown_init(git_hash_ctx *ctx)
 {
 	die("trying to init unknown hash");
 }
 
-static void git_hash_unknown_update(void *ctx, const void *data, size_t len)
+static void git_hash_unknown_update(git_hash_ctx *ctx, const void *data, size_t len)
 {
 	die("trying to update unknown hash");
 }
 
-static void git_hash_unknown_final(unsigned char *hash, void *ctx)
+static void git_hash_unknown_final(unsigned char *hash, git_hash_ctx *ctx)
 {
 	die("trying to finalize unknown hash");
 }
@@ -77,7 +80,6 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 		0x00000000,
 		0,
 		0,
-		0,
 		git_hash_unknown_init,
 		git_hash_unknown_update,
 		git_hash_unknown_final,
@@ -88,7 +90,6 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 		"sha-1",
 		/* "sha1", big-endian */
 		0x73686131,
-		sizeof(git_SHA_CTX),
 		GIT_SHA1_RAWSZ,
 		GIT_SHA1_HEXSZ,
 		git_hash_sha1_init,
@@ -790,31 +791,31 @@ void *xmmap(void *start, size_t length,
  * With "map" == NULL, try reading the object named with "sha1" using
  * the streaming interface and rehash it to do the same.
  */
-int check_sha1_signature(const unsigned char *sha1, void *map,
-			 unsigned long size, const char *type)
+int check_object_signature(const struct object_id *oid, void *map,
+			   unsigned long size, const char *type)
 {
-	unsigned char real_sha1[20];
+	struct object_id real_oid;
 	enum object_type obj_type;
 	struct git_istream *st;
-	git_SHA_CTX c;
-	char hdr[32];
+	git_hash_ctx c;
+	char hdr[MAX_HEADER_LEN];
 	int hdrlen;
 
 	if (map) {
-		hash_sha1_file(map, size, type, real_sha1);
-		return hashcmp(sha1, real_sha1) ? -1 : 0;
+		hash_object_file(map, size, type, &real_oid);
+		return oidcmp(oid, &real_oid) ? -1 : 0;
 	}
 
-	st = open_istream(sha1, &obj_type, &size, NULL);
+	st = open_istream(oid, &obj_type, &size, NULL);
 	if (!st)
 		return -1;
 
 	/* Generate the header */
-	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(obj_type), size) + 1;
+	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(obj_type), size) + 1;
 
 	/* Sha1.. */
-	git_SHA1_Init(&c);
-	git_SHA1_Update(&c, hdr, hdrlen);
+	the_hash_algo->init_fn(&c);
+	the_hash_algo->update_fn(&c, hdr, hdrlen);
 	for (;;) {
 		char buf[1024 * 16];
 		ssize_t readlen = read_istream(st, buf, sizeof(buf));
@@ -825,11 +826,11 @@ int check_sha1_signature(const unsigned char *sha1, void *map,
 		}
 		if (!readlen)
 			break;
-		git_SHA1_Update(&c, buf, readlen);
+		the_hash_algo->update_fn(&c, buf, readlen);
 	}
-	git_SHA1_Final(real_sha1, &c);
+	the_hash_algo->final_fn(real_oid.hash, &c);
 	close_istream(st);
-	return hashcmp(sha1, real_sha1) ? -1 : 0;
+	return oidcmp(oid, &real_oid) ? -1 : 0;
 }
 
 int git_open_cloexec(const char *name, int flags)
@@ -1101,8 +1102,8 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
 	}
 
 	type = type_from_string_gently(type_buf, type_len, 1);
-	if (oi->typename)
-		strbuf_add(oi->typename, type_buf, type_len);
+	if (oi->type_name)
+		strbuf_add(oi->type_name, type_buf, type_len);
 	/*
 	 * Set type to 0 if its an unknown object and
 	 * we're obtaining the type using '--allow-unknown-type'
@@ -1157,7 +1158,7 @@ static int sha1_loose_object_info(struct repository *r,
 	unsigned long mapsize;
 	void *map;
 	git_zstream stream;
-	char hdr[32];
+	char hdr[MAX_HEADER_LEN];
 	struct strbuf hdrbuf = STRBUF_INIT;
 	unsigned long size_scratch;
 
@@ -1172,7 +1173,7 @@ static int sha1_loose_object_info(struct repository *r,
 	 * return value implicitly indicates whether the
 	 * object even exists.
 	 */
-	if (!oi->typep && !oi->typename && !oi->sizep && !oi->contentp) {
+	if (!oi->typep && !oi->type_name && !oi->sizep && !oi->contentp) {
 		const char *path;
 		struct stat st;
 		if (stat_sha1_file(r, sha1, &st, &path) < 0)
@@ -1229,24 +1230,25 @@ static int sha1_loose_object_info(struct repository *r,
 
 int fetch_if_missing = 1;
 
-int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, unsigned flags)
+int oid_object_info_extended(const struct object_id *oid, struct object_info *oi, unsigned flags)
 {
 	static struct object_info blank_oi = OBJECT_INFO_INIT;
 	struct pack_entry e;
 	int rtype;
-	const unsigned char *real = (flags & OBJECT_INFO_LOOKUP_REPLACE) ?
-				    lookup_replace_object(sha1) :
-				    sha1;
+	const struct object_id *real = oid;
 	int already_retried = 0;
 
-	if (is_null_sha1(real))
+	if (flags & OBJECT_INFO_LOOKUP_REPLACE)
+		real = lookup_replace_object(oid);
+
+	if (is_null_oid(real))
 		return -1;
 
 	if (!oi)
 		oi = &blank_oi;
 
 	if (!(flags & OBJECT_INFO_SKIP_CACHED)) {
-		struct cached_object *co = find_cached_object(real);
+		struct cached_object *co = find_cached_object(real->hash);
 		if (co) {
 			if (oi->typep)
 				*(oi->typep) = co->type;
@@ -1256,8 +1258,8 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 				*(oi->disk_sizep) = 0;
 			if (oi->delta_base_sha1)
 				hashclr(oi->delta_base_sha1);
-			if (oi->typename)
-				strbuf_addstr(oi->typename, typename(co->type));
+			if (oi->type_name)
+				strbuf_addstr(oi->type_name, type_name(co->type));
 			if (oi->contentp)
 				*oi->contentp = xmemdupz(co->buf, co->size);
 			oi->whence = OI_CACHED;
@@ -1266,17 +1268,22 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 	}
 
 	while (1) {
-		if (find_pack_entry(real, &e))
+		if (find_pack_entry(real->hash, &e))
 			break;
 
+		if (flags & OBJECT_INFO_IGNORE_LOOSE)
+			return -1;
+
 		/* Most likely it's a loose object. */
-		if (!sha1_loose_object_info(the_repository, real, oi, flags))
+		if (!sha1_loose_object_info(the_repository, real->hash, oi, flags))
 			return 0;
 
 		/* Not a loose object; someone else may have just packed it. */
-		reprepare_packed_git();
-		if (find_pack_entry(real, &e))
-			break;
+		if (!(flags & OBJECT_INFO_QUICK)) {
+			reprepare_packed_git();
+			if (find_pack_entry(real->hash, &e))
+				break;
+		}
 
 		/* Check if it is a missing object */
 		if (fetch_if_missing && repository_format_partial_clone &&
@@ -1285,7 +1292,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 			 * TODO Investigate haveing fetch_object() return
 			 * TODO error/success and stopping the music here.
 			 */
-			fetch_object(repository_format_partial_clone, real);
+			fetch_object(repository_format_partial_clone, real->hash);
 			already_retried = 1;
 			continue;
 		}
@@ -1301,8 +1308,8 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 		return 0;
 	rtype = packed_object_info(e.p, e.offset, oi);
 	if (rtype < 0) {
-		mark_bad_packed_object(e.p, real);
-		return sha1_object_info_extended(real, oi, 0);
+		mark_bad_packed_object(e.p, real->hash);
+		return oid_object_info_extended(real, oi, 0);
 	} else if (oi->whence == OI_PACKED) {
 		oi->u.packed.offset = e.offset;
 		oi->u.packed.pack = e.p;
@@ -1314,15 +1321,15 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 }
 
 /* returns enum object_type or negative */
-int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
+int oid_object_info(const struct object_id *oid, unsigned long *sizep)
 {
 	enum object_type type;
 	struct object_info oi = OBJECT_INFO_INIT;
 
 	oi.typep = &type;
 	oi.sizep = sizep;
-	if (sha1_object_info_extended(sha1, &oi,
-				      OBJECT_INFO_LOOKUP_REPLACE) < 0)
+	if (oid_object_info_extended(oid, &oi,
+				     OBJECT_INFO_LOOKUP_REPLACE) < 0)
 		return -1;
 	return type;
 }
@@ -1330,24 +1337,27 @@ int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
 static void *read_object(const unsigned char *sha1, enum object_type *type,
 			 unsigned long *size)
 {
+	struct object_id oid;
 	struct object_info oi = OBJECT_INFO_INIT;
 	void *content;
 	oi.typep = type;
 	oi.sizep = size;
 	oi.contentp = &content;
 
-	if (sha1_object_info_extended(sha1, &oi, 0) < 0)
+	hashcpy(oid.hash, sha1);
+
+	if (oid_object_info_extended(&oid, &oi, 0) < 0)
 		return NULL;
 	return content;
 }
 
-int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
-		      unsigned char *sha1)
+int pretend_object_file(void *buf, unsigned long len, enum object_type type,
+			struct object_id *oid)
 {
 	struct cached_object *co;
 
-	hash_sha1_file(buf, len, typename(type), sha1);
-	if (has_sha1_file(sha1) || find_cached_object(sha1))
+	hash_object_file(buf, len, type_name(type), oid);
+	if (has_sha1_file(oid->hash) || find_cached_object(oid->hash))
 		return 0;
 	ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc);
 	co = &cached_objects[cached_object_nr++];
@@ -1355,7 +1365,7 @@ int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
 	co->type = type;
 	co->buf = xmalloc(len);
 	memcpy(co->buf, buf, len);
-	hashcpy(co->sha1, sha1);
+	hashcpy(co->sha1, oid->hash);
 	return 0;
 }
 
@@ -1364,65 +1374,65 @@ int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
  * deal with them should arrange to call read_object() and give error
  * messages themselves.
  */
-void *read_sha1_file_extended(const unsigned char *sha1,
-			      enum object_type *type,
-			      unsigned long *size,
-			      int lookup_replace)
+void *read_object_file_extended(const struct object_id *oid,
+				enum object_type *type,
+				unsigned long *size,
+				int lookup_replace)
 {
 	void *data;
 	const struct packed_git *p;
 	const char *path;
 	struct stat st;
-	const unsigned char *repl = lookup_replace ? lookup_replace_object(sha1)
-						   : sha1;
+	const struct object_id *repl = lookup_replace ? lookup_replace_object(oid)
+						      : oid;
 
 	errno = 0;
-	data = read_object(repl, type, size);
+	data = read_object(repl->hash, type, size);
 	if (data)
 		return data;
 
 	if (errno && errno != ENOENT)
-		die_errno("failed to read object %s", sha1_to_hex(sha1));
+		die_errno("failed to read object %s", oid_to_hex(oid));
 
 	/* die if we replaced an object with one that does not exist */
-	if (repl != sha1)
+	if (repl != oid)
 		die("replacement %s not found for %s",
-		    sha1_to_hex(repl), sha1_to_hex(sha1));
+		    oid_to_hex(repl), oid_to_hex(oid));
 
-	if (!stat_sha1_file(the_repository, repl, &st, &path))
+	if (!stat_sha1_file(the_repository, repl->hash, &st, &path))
 		die("loose object %s (stored in %s) is corrupt",
-		    sha1_to_hex(repl), path);
+		    oid_to_hex(repl), path);
 
-	if ((p = has_packed_and_bad(repl)) != NULL)
+	if ((p = has_packed_and_bad(repl->hash)) != NULL)
 		die("packed object %s (stored in %s) is corrupt",
-		    sha1_to_hex(repl), p->pack_name);
+		    oid_to_hex(repl), p->pack_name);
 
 	return NULL;
 }
 
-void *read_object_with_reference(const unsigned char *sha1,
+void *read_object_with_reference(const struct object_id *oid,
 				 const char *required_type_name,
 				 unsigned long *size,
-				 unsigned char *actual_sha1_return)
+				 struct object_id *actual_oid_return)
 {
 	enum object_type type, required_type;
 	void *buffer;
 	unsigned long isize;
-	unsigned char actual_sha1[20];
+	struct object_id actual_oid;
 
 	required_type = type_from_string(required_type_name);
-	hashcpy(actual_sha1, sha1);
+	oidcpy(&actual_oid, oid);
 	while (1) {
 		int ref_length = -1;
 		const char *ref_type = NULL;
 
-		buffer = read_sha1_file(actual_sha1, &type, &isize);
+		buffer = read_object_file(&actual_oid, &type, &isize);
 		if (!buffer)
 			return NULL;
 		if (type == required_type) {
 			*size = isize;
-			if (actual_sha1_return)
-				hashcpy(actual_sha1_return, actual_sha1);
+			if (actual_oid_return)
+				oidcpy(actual_oid_return, &actual_oid);
 			return buffer;
 		}
 		/* Handle references */
@@ -1436,32 +1446,32 @@ void *read_object_with_reference(const unsigned char *sha1,
 		}
 		ref_length = strlen(ref_type);
 
-		if (ref_length + 40 > isize ||
+		if (ref_length + GIT_SHA1_HEXSZ > isize ||
 		    memcmp(buffer, ref_type, ref_length) ||
-		    get_sha1_hex((char *) buffer + ref_length, actual_sha1)) {
+		    get_oid_hex((char *) buffer + ref_length, &actual_oid)) {
 			free(buffer);
 			return NULL;
 		}
 		free(buffer);
 		/* Now we have the ID of the referred-to object in
-		 * actual_sha1.  Check again. */
+		 * actual_oid.  Check again. */
 	}
 }
 
-static void write_sha1_file_prepare(const void *buf, unsigned long len,
-                                    const char *type, unsigned char *sha1,
-                                    char *hdr, int *hdrlen)
+static void write_object_file_prepare(const void *buf, unsigned long len,
+				      const char *type, struct object_id *oid,
+				      char *hdr, int *hdrlen)
 {
-	git_SHA_CTX c;
+	git_hash_ctx c;
 
 	/* Generate the header */
 	*hdrlen = xsnprintf(hdr, *hdrlen, "%s %lu", type, len)+1;
 
 	/* Sha1.. */
-	git_SHA1_Init(&c);
-	git_SHA1_Update(&c, hdr, *hdrlen);
-	git_SHA1_Update(&c, buf, len);
-	git_SHA1_Final(sha1, &c);
+	the_hash_algo->init_fn(&c);
+	the_hash_algo->update_fn(&c, hdr, *hdrlen);
+	the_hash_algo->update_fn(&c, buf, len);
+	the_hash_algo->final_fn(oid->hash, &c);
 }
 
 /*
@@ -1514,12 +1524,12 @@ static int write_buffer(int fd, const void *buf, size_t len)
 	return 0;
 }
 
-int hash_sha1_file(const void *buf, unsigned long len, const char *type,
-                   unsigned char *sha1)
+int hash_object_file(const void *buf, unsigned long len, const char *type,
+		     struct object_id *oid)
 {
-	char hdr[32];
+	char hdr[MAX_HEADER_LEN];
 	int hdrlen = sizeof(hdr);
-	write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
+	write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen);
 	return 0;
 }
 
@@ -1577,19 +1587,20 @@ static int create_tmpfile(struct strbuf *tmp, const char *filename)
 	return fd;
 }
 
-static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
-			      const void *buf, unsigned long len, time_t mtime)
+static int write_loose_object(const struct object_id *oid, char *hdr,
+			      int hdrlen, const void *buf, unsigned long len,
+			      time_t mtime)
 {
 	int fd, ret;
 	unsigned char compressed[4096];
 	git_zstream stream;
-	git_SHA_CTX c;
-	unsigned char parano_sha1[20];
+	git_hash_ctx c;
+	struct object_id parano_oid;
 	static struct strbuf tmp_file = STRBUF_INIT;
 	static struct strbuf filename = STRBUF_INIT;
 
 	strbuf_reset(&filename);
-	sha1_file_name(the_repository, &filename, sha1);
+	sha1_file_name(the_repository, &filename, oid->hash);
 
 	fd = create_tmpfile(&tmp_file, filename.buf);
 	if (fd < 0) {
@@ -1603,14 +1614,14 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 	git_deflate_init(&stream, zlib_compression_level);
 	stream.next_out = compressed;
 	stream.avail_out = sizeof(compressed);
-	git_SHA1_Init(&c);
+	the_hash_algo->init_fn(&c);
 
 	/* First header.. */
 	stream.next_in = (unsigned char *)hdr;
 	stream.avail_in = hdrlen;
 	while (git_deflate(&stream, 0) == Z_OK)
 		; /* nothing */
-	git_SHA1_Update(&c, hdr, hdrlen);
+	the_hash_algo->update_fn(&c, hdr, hdrlen);
 
 	/* Then the data itself.. */
 	stream.next_in = (void *)buf;
@@ -1618,7 +1629,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 	do {
 		unsigned char *in0 = stream.next_in;
 		ret = git_deflate(&stream, Z_FINISH);
-		git_SHA1_Update(&c, in0, stream.next_in - in0);
+		the_hash_algo->update_fn(&c, in0, stream.next_in - in0);
 		if (write_buffer(fd, compressed, stream.next_out - compressed) < 0)
 			die("unable to write sha1 file");
 		stream.next_out = compressed;
@@ -1626,13 +1637,16 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 	} while (ret == Z_OK);
 
 	if (ret != Z_STREAM_END)
-		die("unable to deflate new object %s (%d)", sha1_to_hex(sha1), ret);
+		die("unable to deflate new object %s (%d)", oid_to_hex(oid),
+		    ret);
 	ret = git_deflate_end_gently(&stream);
 	if (ret != Z_OK)
-		die("deflateEnd on object %s failed (%d)", sha1_to_hex(sha1), ret);
-	git_SHA1_Final(parano_sha1, &c);
-	if (hashcmp(sha1, parano_sha1) != 0)
-		die("confused by unstable object source data for %s", sha1_to_hex(sha1));
+		die("deflateEnd on object %s failed (%d)", oid_to_hex(oid),
+		    ret);
+	the_hash_algo->final_fn(parano_oid.hash, &c);
+	if (oidcmp(oid, &parano_oid) != 0)
+		die("confused by unstable object source data for %s",
+		    oid_to_hex(oid));
 
 	close_sha1_file(fd);
 
@@ -1665,58 +1679,60 @@ static int freshen_packed_object(const unsigned char *sha1)
 	return 1;
 }
 
-int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1)
+int write_object_file(const void *buf, unsigned long len, const char *type,
+		      struct object_id *oid)
 {
-	char hdr[32];
+	char hdr[MAX_HEADER_LEN];
 	int hdrlen = sizeof(hdr);
 
 	/* Normally if we have it in the pack then we do not bother writing
 	 * it out into .git/objects/??/?{38} file.
 	 */
-	write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
-	if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
+	write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen);
+	if (freshen_packed_object(oid->hash) || freshen_loose_object(oid->hash))
 		return 0;
-	return write_loose_object(sha1, hdr, hdrlen, buf, len, 0);
+	return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
 }
 
-int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
-			     struct object_id *oid, unsigned flags)
+int hash_object_file_literally(const void *buf, unsigned long len,
+			       const char *type, struct object_id *oid,
+			       unsigned flags)
 {
 	char *header;
 	int hdrlen, status = 0;
 
 	/* type string, SP, %lu of the length plus NUL must fit this */
-	hdrlen = strlen(type) + 32;
+	hdrlen = strlen(type) + MAX_HEADER_LEN;
 	header = xmalloc(hdrlen);
-	write_sha1_file_prepare(buf, len, type, oid->hash, header, &hdrlen);
+	write_object_file_prepare(buf, len, type, oid, header, &hdrlen);
 
 	if (!(flags & HASH_WRITE_OBJECT))
 		goto cleanup;
 	if (freshen_packed_object(oid->hash) || freshen_loose_object(oid->hash))
 		goto cleanup;
-	status = write_loose_object(oid->hash, header, hdrlen, buf, len, 0);
+	status = write_loose_object(oid, header, hdrlen, buf, len, 0);
 
 cleanup:
 	free(header);
 	return status;
 }
 
-int force_object_loose(const unsigned char *sha1, time_t mtime)
+int force_object_loose(const struct object_id *oid, time_t mtime)
 {
 	void *buf;
 	unsigned long len;
 	enum object_type type;
-	char hdr[32];
+	char hdr[MAX_HEADER_LEN];
 	int hdrlen;
 	int ret;
 
-	if (has_loose_object(sha1))
+	if (has_loose_object(oid->hash))
 		return 0;
-	buf = read_object(sha1, &type, &len);
+	buf = read_object(oid->hash, &type, &len);
 	if (!buf)
-		return error("cannot read sha1_file for %s", sha1_to_hex(sha1));
-	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), len) + 1;
-	ret = write_loose_object(sha1, hdr, hdrlen, buf, len, mtime);
+		return error("cannot read sha1_file for %s", oid_to_hex(oid));
+	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), len) + 1;
+	ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime);
 	free(buf);
 
 	return ret;
@@ -1724,10 +1740,12 @@ int force_object_loose(const unsigned char *sha1, time_t mtime)
 
 int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
 {
+	struct object_id oid;
 	if (!startup_info->have_repository)
 		return 0;
-	return sha1_object_info_extended(sha1, NULL,
-					 flags | OBJECT_INFO_SKIP_CACHED) >= 0;
+	hashcpy(oid.hash, sha1);
+	return oid_object_info_extended(&oid, NULL,
+					flags | OBJECT_INFO_SKIP_CACHED) >= 0;
 }
 
 int has_object_file(const struct object_id *oid)
@@ -1799,9 +1817,9 @@ static int index_mem(struct object_id *oid, void *buf, size_t size,
 	}
 
 	if (write_object)
-		ret = write_sha1_file(buf, size, typename(type), oid->hash);
+		ret = write_object_file(buf, size, type_name(type), oid);
 	else
-		ret = hash_sha1_file(buf, size, typename(type), oid->hash);
+		ret = hash_object_file(buf, size, type_name(type), oid);
 	if (re_allocated)
 		free(buf);
 	return ret;
@@ -1821,11 +1839,11 @@ static int index_stream_convert_blob(struct object_id *oid, int fd,
 				 get_conv_flags(flags));
 
 	if (write_object)
-		ret = write_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
-				      oid->hash);
+		ret = write_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
+					oid);
 	else
-		ret = hash_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
-				     oid->hash);
+		ret = hash_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
+				       oid);
 	strbuf_release(&sbuf);
 	return ret;
 }
@@ -1893,7 +1911,7 @@ static int index_stream(struct object_id *oid, int fd, size_t size,
 			enum object_type type, const char *path,
 			unsigned flags)
 {
-	return index_bulk_checkin(oid->hash, fd, size, type, path, flags);
+	return index_bulk_checkin(oid, fd, size, type, path, flags);
 }
 
 int index_fd(struct object_id *oid, int fd, struct stat *st,
@@ -1939,8 +1957,8 @@ int index_path(struct object_id *oid, const char *path, struct stat *st, unsigne
 		if (strbuf_readlink(&sb, path, st->st_size))
 			return error_errno("readlink(\"%s\")", path);
 		if (!(flags & HASH_WRITE_OBJECT))
-			hash_sha1_file(sb.buf, sb.len, blob_type, oid->hash);
-		else if (write_sha1_file(sb.buf, sb.len, blob_type, oid->hash))
+			hash_object_file(sb.buf, sb.len, blob_type, oid);
+		else if (write_object_file(sb.buf, sb.len, blob_type, oid))
 			rc = error("%s: failed to insert into database", path);
 		strbuf_release(&sb);
 		break;
@@ -1967,14 +1985,14 @@ int read_pack_header(int fd, struct pack_header *header)
 	return 0;
 }
 
-void assert_sha1_type(const unsigned char *sha1, enum object_type expect)
+void assert_oid_type(const struct object_id *oid, enum object_type expect)
 {
-	enum object_type type = sha1_object_info(sha1, NULL);
+	enum object_type type = oid_object_info(oid, NULL);
 	if (type < 0)
-		die("%s is not a valid object", sha1_to_hex(sha1));
+		die("%s is not a valid object", oid_to_hex(oid));
 	if (type != expect)
-		die("%s is not a valid '%s' object", sha1_to_hex(sha1),
-		    typename(expect));
+		die("%s is not a valid '%s' object", oid_to_hex(oid),
+		    type_name(expect));
 }
 
 int for_each_file_in_obj_subdir(unsigned int subdir_nr,
@@ -2125,14 +2143,14 @@ static int check_stream_sha1(git_zstream *stream,
 			     const char *path,
 			     const unsigned char *expected_sha1)
 {
-	git_SHA_CTX c;
+	git_hash_ctx c;
 	unsigned char real_sha1[GIT_MAX_RAWSZ];
 	unsigned char buf[4096];
 	unsigned long total_read;
 	int status = Z_OK;
 
-	git_SHA1_Init(&c);
-	git_SHA1_Update(&c, hdr, stream->total_out);
+	the_hash_algo->init_fn(&c);
+	the_hash_algo->update_fn(&c, hdr, stream->total_out);
 
 	/*
 	 * We already read some bytes into hdr, but the ones up to the NUL
@@ -2151,7 +2169,7 @@ static int check_stream_sha1(git_zstream *stream,
 		if (size - total_read < stream->avail_out)
 			stream->avail_out = size - total_read;
 		status = git_inflate(stream, Z_FINISH);
-		git_SHA1_Update(&c, buf, stream->next_out - buf);
+		the_hash_algo->update_fn(&c, buf, stream->next_out - buf);
 		total_read += stream->next_out - buf;
 	}
 	git_inflate_end(stream);
@@ -2166,7 +2184,7 @@ static int check_stream_sha1(git_zstream *stream,
 		return -1;
 	}
 
-	git_SHA1_Final(real_sha1, &c);
+	the_hash_algo->final_fn(real_sha1, &c);
 	if (hashcmp(expected_sha1, real_sha1)) {
 		error("sha1 mismatch for %s (expected %s)", path,
 		      sha1_to_hex(expected_sha1));
@@ -2177,7 +2195,7 @@ static int check_stream_sha1(git_zstream *stream,
 }
 
 int read_loose_object(const char *path,
-		      const unsigned char *expected_sha1,
+		      const struct object_id *expected_oid,
 		      enum object_type *type,
 		      unsigned long *size,
 		      void **contents)
@@ -2186,7 +2204,7 @@ int read_loose_object(const char *path,
 	void *map = NULL;
 	unsigned long mapsize;
 	git_zstream stream;
-	char hdr[32];
+	char hdr[MAX_HEADER_LEN];
 
 	*contents = NULL;
 
@@ -2209,19 +2227,19 @@ int read_loose_object(const char *path,
 	}
 
 	if (*type == OBJ_BLOB) {
-		if (check_stream_sha1(&stream, hdr, *size, path, expected_sha1) < 0)
+		if (check_stream_sha1(&stream, hdr, *size, path, expected_oid->hash) < 0)
 			goto out;
 	} else {
-		*contents = unpack_sha1_rest(&stream, hdr, *size, expected_sha1);
+		*contents = unpack_sha1_rest(&stream, hdr, *size, expected_oid->hash);
 		if (!*contents) {
 			error("unable to unpack contents of %s", path);
 			git_inflate_end(&stream);
 			goto out;
 		}
-		if (check_sha1_signature(expected_sha1, *contents,
-					 *size, typename(*type))) {
+		if (check_object_signature(expected_oid, *contents,
+					 *size, type_name(*type))) {
 			error("sha1 mismatch for %s (expected %s)", path,
-			      sha1_to_hex(expected_sha1));
+			      oid_to_hex(expected_oid));
 			free(*contents);
 			goto out;
 		}
diff --git a/sha1_name.c b/sha1_name.c
index 4325f74..509a95f 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -152,31 +152,14 @@ static int match_sha(unsigned len, const unsigned char *a, const unsigned char *
 static void unique_in_pack(struct packed_git *p,
 			   struct disambiguate_state *ds)
 {
-	uint32_t num, last, i, first = 0;
+	uint32_t num, i, first = 0;
 	const struct object_id *current = NULL;
 
 	if (open_pack_index(p) || !p->num_objects)
 		return;
 
 	num = p->num_objects;
-	last = num;
-	while (first < last) {
-		uint32_t mid = first + (last - first) / 2;
-		const unsigned char *current;
-		int cmp;
-
-		current = nth_packed_object_sha1(p, mid);
-		cmp = hashcmp(ds->bin_pfx.hash, current);
-		if (!cmp) {
-			first = mid;
-			break;
-		}
-		if (cmp > 0) {
-			first = mid+1;
-			continue;
-		}
-		last = mid;
-	}
+	bsearch_pack(&ds->bin_pfx, p, &first);
 
 	/*
 	 * At this point, "first" is the location of the lowest object
@@ -241,7 +224,7 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
 
 static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused)
 {
-	int kind = sha1_object_info(oid->hash, NULL);
+	int kind = oid_object_info(oid, NULL);
 	return kind == OBJ_COMMIT;
 }
 
@@ -250,7 +233,7 @@ static int disambiguate_committish_only(const struct object_id *oid, void *cb_da
 	struct object *obj;
 	int kind;
 
-	kind = sha1_object_info(oid->hash, NULL);
+	kind = oid_object_info(oid, NULL);
 	if (kind == OBJ_COMMIT)
 		return 1;
 	if (kind != OBJ_TAG)
@@ -265,7 +248,7 @@ static int disambiguate_committish_only(const struct object_id *oid, void *cb_da
 
 static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused)
 {
-	int kind = sha1_object_info(oid->hash, NULL);
+	int kind = oid_object_info(oid, NULL);
 	return kind == OBJ_TREE;
 }
 
@@ -274,7 +257,7 @@ static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_
 	struct object *obj;
 	int kind;
 
-	kind = sha1_object_info(oid->hash, NULL);
+	kind = oid_object_info(oid, NULL);
 	if (kind == OBJ_TREE || kind == OBJ_COMMIT)
 		return 1;
 	if (kind != OBJ_TAG)
@@ -289,7 +272,7 @@ static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_
 
 static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused)
 {
-	int kind = sha1_object_info(oid->hash, NULL);
+	int kind = oid_object_info(oid, NULL);
 	return kind == OBJ_BLOB;
 }
 
@@ -368,7 +351,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
 	if (ds->fn && !ds->fn(oid, ds->cb_data))
 		return 0;
 
-	type = sha1_object_info(oid->hash, NULL);
+	type = oid_object_info(oid, NULL);
 	if (type == OBJ_COMMIT) {
 		struct commit *commit = lookup_commit(oid);
 		if (commit) {
@@ -383,8 +366,8 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
 	}
 
 	advise("  %s %s%s",
-	       find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
-	       typename(type) ? typename(type) : "unknown type",
+	       find_unique_abbrev(oid, DEFAULT_ABBREV),
+	       type_name(type) ? type_name(type) : "unknown type",
 	       desc.buf);
 
 	strbuf_release(&desc);
@@ -483,7 +466,7 @@ struct min_abbrev_data {
 	unsigned int init_len;
 	unsigned int cur_len;
 	char *hex;
-	const unsigned char *hash;
+	const struct object_id *oid;
 };
 
 static inline char get_hex_char_from_oid(const struct object_id *oid,
@@ -515,50 +498,34 @@ static void find_abbrev_len_for_pack(struct packed_git *p,
 				     struct min_abbrev_data *mad)
 {
 	int match = 0;
-	uint32_t num, last, first = 0;
+	uint32_t num, first = 0;
 	struct object_id oid;
+	const struct object_id *mad_oid;
 
 	if (open_pack_index(p) || !p->num_objects)
 		return;
 
 	num = p->num_objects;
-	last = num;
-	while (first < last) {
-		uint32_t mid = first + (last - first) / 2;
-		const unsigned char *current;
-		int cmp;
-
-		current = nth_packed_object_sha1(p, mid);
-		cmp = hashcmp(mad->hash, current);
-		if (!cmp) {
-			match = 1;
-			first = mid;
-			break;
-		}
-		if (cmp > 0) {
-			first = mid + 1;
-			continue;
-		}
-		last = mid;
-	}
+	mad_oid = mad->oid;
+	match = bsearch_pack(mad_oid, p, &first);
 
 	/*
 	 * first is now the position in the packfile where we would insert
 	 * mad->hash if it does not exist (or the position of mad->hash if
-	 * it does exist). Hence, we consider a maximum of three objects
+	 * it does exist). Hence, we consider a maximum of two objects
 	 * nearby for the abbreviation length.
 	 */
 	mad->init_len = 0;
 	if (!match) {
-		nth_packed_object_oid(&oid, p, first);
-		extend_abbrev_len(&oid, mad);
+		if (nth_packed_object_oid(&oid, p, first))
+			extend_abbrev_len(&oid, mad);
 	} else if (first < num - 1) {
-		nth_packed_object_oid(&oid, p, first + 1);
-		extend_abbrev_len(&oid, mad);
+		if (nth_packed_object_oid(&oid, p, first + 1))
+			extend_abbrev_len(&oid, mad);
 	}
 	if (first > 0) {
-		nth_packed_object_oid(&oid, p, first - 1);
-		extend_abbrev_len(&oid, mad);
+		if (nth_packed_object_oid(&oid, p, first - 1))
+			extend_abbrev_len(&oid, mad);
 	}
 	mad->init_len = mad->cur_len;
 }
@@ -572,7 +539,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
 		find_abbrev_len_for_pack(p, mad);
 }
 
-int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
+int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)
 {
 	struct disambiguate_state ds;
 	struct min_abbrev_data mad;
@@ -599,14 +566,14 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
 			len = FALLBACK_DEFAULT_ABBREV;
 	}
 
-	sha1_to_hex_r(hex, sha1);
+	oid_to_hex_r(hex, oid);
 	if (len == GIT_SHA1_HEXSZ || !len)
 		return GIT_SHA1_HEXSZ;
 
 	mad.init_len = len;
 	mad.cur_len = len;
 	mad.hex = hex;
-	mad.hash = sha1;
+	mad.oid = oid;
 
 	find_abbrev_len_packed(&mad);
 
@@ -624,13 +591,13 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
 	return mad.cur_len;
 }
 
-const char *find_unique_abbrev(const unsigned char *sha1, int len)
+const char *find_unique_abbrev(const struct object_id *oid, int len)
 {
 	static int bufno;
 	static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
 	char *hex = hexbuffer[bufno];
 	bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
-	find_unique_abbrev_r(hex, sha1, len);
+	find_unique_abbrev_r(hex, oid, len);
 	return hex;
 }
 
@@ -904,8 +871,8 @@ struct object *peel_to_type(const char *name, int namelen,
 			if (name)
 				error("%.*s: expected %s type, but the object "
 				      "dereferences to %s type",
-				      namelen, name, typename(expected_type),
-				      typename(o->type));
+				      namelen, name, type_name(expected_type),
+				      type_name(o->type));
 			return NULL;
 		}
 	}
@@ -1532,8 +1499,7 @@ static void diagnose_invalid_oid_path(const char *prefix,
 	if (is_missing_file_error(errno)) {
 		char *fullname = xstrfmt("%s%s", prefix, filename);
 
-		if (!get_tree_entry(tree_oid->hash, fullname,
-				    oid.hash, &mode)) {
+		if (!get_tree_entry(tree_oid, fullname, &oid, &mode)) {
 			die("Path '%s' exists, but not '%s'.\n"
 			    "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
 			    fullname,
@@ -1725,8 +1691,8 @@ static int get_oid_with_context_1(const char *name,
 					filename, oid->hash, &oc->symlink_path,
 					&oc->mode);
 			} else {
-				ret = get_tree_entry(tree_oid.hash, filename,
-						     oid->hash, &oc->mode);
+				ret = get_tree_entry(&tree_oid, filename, oid,
+						     &oc->mode);
 				if (ret && only_to_die) {
 					diagnose_invalid_oid_path(prefix,
 								   filename,
diff --git a/sha1dc_git.h b/sha1dc_git.h
index a8c2729..41e1c3f 100644
--- a/sha1dc_git.h
+++ b/sha1dc_git.h
@@ -1,9 +1,9 @@
 /* Plumbing with collition-detecting SHA1 code */
 
-#ifdef DC_SHA1_SUBMODULE
-#include "sha1collisiondetection/lib/sha1.h"
-#elif defined(DC_SHA1_EXTERNAL)
+#ifdef DC_SHA1_EXTERNAL
 #include <sha1dc/sha1.h>
+#elif defined(DC_SHA1_SUBMODULE)
+#include "sha1collisiondetection/lib/sha1.h"
 #else
 #include "sha1dc/sha1.h"
 #endif
diff --git a/split-index.c b/split-index.c
index 284d04d..3eb8ff1 100644
--- a/split-index.c
+++ b/split-index.c
@@ -305,17 +305,17 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
 }
 
 void replace_index_entry_in_base(struct index_state *istate,
-				 struct cache_entry *old,
-				 struct cache_entry *new)
+				 struct cache_entry *old_entry,
+				 struct cache_entry *new_entry)
 {
-	if (old->index &&
+	if (old_entry->index &&
 	    istate->split_index &&
 	    istate->split_index->base &&
-	    old->index <= istate->split_index->base->cache_nr) {
-		new->index = old->index;
-		if (old != istate->split_index->base->cache[new->index - 1])
-			free(istate->split_index->base->cache[new->index - 1]);
-		istate->split_index->base->cache[new->index - 1] = new;
+	    old_entry->index <= istate->split_index->base->cache_nr) {
+		new_entry->index = old_entry->index;
+		if (old_entry != istate->split_index->base->cache[new_entry->index - 1])
+			free(istate->split_index->base->cache[new_entry->index - 1]);
+		istate->split_index->base->cache[new_entry->index - 1] = new_entry;
 	}
 }
 
diff --git a/split-index.h b/split-index.h
index df91c1b..43d6682 100644
--- a/split-index.h
+++ b/split-index.h
@@ -21,7 +21,7 @@ struct split_index *init_split_index(struct index_state *istate);
 void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
 void replace_index_entry_in_base(struct index_state *istate,
 				 struct cache_entry *old,
-				 struct cache_entry *new);
+				 struct cache_entry *new_entry);
 int read_link_extension(struct index_state *istate,
 			const void *data, unsigned long sz);
 int write_link_extension(struct strbuf *sb,
diff --git a/strbuf.c b/strbuf.c
index 1df674e..83d0502 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "refs.h"
+#include "string-list.h"
 #include "utf8.h"
 
 int starts_with(const char *str, const char *prefix)
@@ -95,6 +96,7 @@ void strbuf_trim(struct strbuf *sb)
 	strbuf_rtrim(sb);
 	strbuf_ltrim(sb);
 }
+
 void strbuf_rtrim(struct strbuf *sb)
 {
 	while (sb->len > 0 && isspace((unsigned char)sb->buf[sb->len - 1]))
@@ -102,6 +104,13 @@ void strbuf_rtrim(struct strbuf *sb)
 	sb->buf[sb->len] = '\0';
 }
 
+void strbuf_trim_trailing_dir_sep(struct strbuf *sb)
+{
+	while (sb->len > 0 && is_dir_sep((unsigned char)sb->buf[sb->len - 1]))
+		sb->len--;
+	sb->buf[sb->len] = '\0';
+}
+
 void strbuf_ltrim(struct strbuf *sb)
 {
 	char *b = sb->buf;
@@ -163,6 +172,21 @@ struct strbuf **strbuf_split_buf(const char *str, size_t slen,
 	return ret;
 }
 
+void strbuf_add_separated_string_list(struct strbuf *str,
+				      const char *sep,
+				      struct string_list *slist)
+{
+	struct string_list_item *item;
+	int sep_needed = 0;
+
+	for_each_string_list_item(item, slist) {
+		if (sep_needed)
+			strbuf_addstr(str, sep);
+		strbuf_addstr(str, item->string);
+		sep_needed = 1;
+	}
+}
+
 void strbuf_list_free(struct strbuf **sbs)
 {
 	struct strbuf **s = sbs;
@@ -612,14 +636,18 @@ ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
 {
 	int fd;
 	ssize_t len;
+	int saved_errno;
 
 	fd = open(path, O_RDONLY);
 	if (fd < 0)
 		return -1;
 	len = strbuf_read(sb, fd, hint);
+	saved_errno = errno;
 	close(fd);
-	if (len < 0)
+	if (len < 0) {
+		errno = saved_errno;
 		return -1;
+	}
 
 	return len;
 }
@@ -869,12 +897,12 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
 	strbuf_setlen(sb, sb->len + len);
 }
 
-void strbuf_add_unique_abbrev(struct strbuf *sb, const unsigned char *sha1,
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
 			      int abbrev_len)
 {
 	int r;
 	strbuf_grow(sb, GIT_SHA1_HEXSZ + 1);
-	r = find_unique_abbrev_r(sb->buf + sb->len, sha1, abbrev_len);
+	r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len);
 	strbuf_setlen(sb, sb->len + r);
 }
 
diff --git a/strbuf.h b/strbuf.h
index 14c8c10..c4de5e4 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -1,6 +1,8 @@
 #ifndef STRBUF_H
 #define STRBUF_H
 
+struct string_list;
+
 /**
  * strbuf's are meant to be used with all the usual C string and memory
  * APIs. Given that the length of the buffer is known, it's often better to
@@ -70,6 +72,12 @@ struct strbuf {
 extern char strbuf_slopbuf[];
 #define STRBUF_INIT  { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
 
+/*
+ * Predeclare this here, since cache.h includes this file before it defines the
+ * struct.
+ */
+struct object_id;
+
 /**
  * Life Cycle Functions
  * --------------------
@@ -179,6 +187,9 @@ extern void strbuf_trim(struct strbuf *);
 extern void strbuf_rtrim(struct strbuf *);
 extern void strbuf_ltrim(struct strbuf *);
 
+/* Strip trailing directory separators */
+extern void strbuf_trim_trailing_dir_sep(struct strbuf *);
+
 /**
  * Replace the contents of the strbuf with a reencoded form.  Returns -1
  * on error, 0 on success.
@@ -528,6 +539,20 @@ static inline struct strbuf **strbuf_split(const struct strbuf *sb,
 	return strbuf_split_max(sb, terminator, 0);
 }
 
+/*
+ * Adds all strings of a string list to the strbuf, separated by the given
+ * separator.  For example, if sep is
+ *   ', '
+ * and slist contains
+ *   ['element1', 'element2', ..., 'elementN'],
+ * then write:
+ *   'element1, element2, ..., elementN'
+ * to str.  If only one element, just write "element1" to str.
+ */
+extern void strbuf_add_separated_string_list(struct strbuf *str,
+					     const char *sep,
+					     struct string_list *slist);
+
 /**
  * Free a NULL-terminated list of strbufs (for example, the return
  * values of the strbuf_split*() functions).
@@ -539,7 +564,7 @@ extern void strbuf_list_free(struct strbuf **);
  * the strbuf `sb`.
  */
 extern void strbuf_add_unique_abbrev(struct strbuf *sb,
-				     const unsigned char *sha1,
+				     const struct object_id *oid,
 				     int abbrev_len);
 
 /**
diff --git a/streaming.c b/streaming.c
index 22d27df..7d55ba6 100644
--- a/streaming.c
+++ b/streaming.c
@@ -16,7 +16,7 @@ enum input_source {
 
 typedef int (*open_istream_fn)(struct git_istream *,
 			       struct object_info *,
-			       const unsigned char *,
+			       const struct object_id *,
 			       enum object_type *);
 typedef int (*close_istream_fn)(struct git_istream *);
 typedef ssize_t (*read_istream_fn)(struct git_istream *, char *, size_t);
@@ -29,7 +29,7 @@ struct stream_vtbl {
 #define open_method_decl(name) \
 	int open_istream_ ##name \
 	(struct git_istream *st, struct object_info *oi, \
-	 const unsigned char *sha1, \
+	 const struct object_id *oid, \
 	 enum object_type *type)
 
 #define close_method_decl(name) \
@@ -107,7 +107,7 @@ ssize_t read_istream(struct git_istream *st, void *buf, size_t sz)
 	return st->vtbl->read(st, buf, sz);
 }
 
-static enum input_source istream_source(const unsigned char *sha1,
+static enum input_source istream_source(const struct object_id *oid,
 					enum object_type *type,
 					struct object_info *oi)
 {
@@ -116,7 +116,7 @@ static enum input_source istream_source(const unsigned char *sha1,
 
 	oi->typep = type;
 	oi->sizep = &size;
-	status = sha1_object_info_extended(sha1, oi, 0);
+	status = oid_object_info_extended(oid, oi, 0);
 	if (status < 0)
 		return stream_error;
 
@@ -132,14 +132,14 @@ static enum input_source istream_source(const unsigned char *sha1,
 	}
 }
 
-struct git_istream *open_istream(const unsigned char *sha1,
+struct git_istream *open_istream(const struct object_id *oid,
 				 enum object_type *type,
 				 unsigned long *size,
 				 struct stream_filter *filter)
 {
 	struct git_istream *st;
 	struct object_info oi = OBJECT_INFO_INIT;
-	const unsigned char *real = lookup_replace_object(sha1);
+	const struct object_id *real = lookup_replace_object(oid);
 	enum input_source src = istream_source(real, type, &oi);
 
 	if (src < 0)
@@ -338,7 +338,7 @@ static struct stream_vtbl loose_vtbl = {
 static open_method_decl(loose)
 {
 	st->u.loose.mapped = map_sha1_file(the_repository,
-					   sha1, &st->u.loose.mapsize);
+					   oid->hash, &st->u.loose.mapsize);
 	if (!st->u.loose.mapped)
 		return -1;
 	if ((unpack_sha1_header(&st->z,
@@ -489,7 +489,7 @@ static struct stream_vtbl incore_vtbl = {
 
 static open_method_decl(incore)
 {
-	st->u.incore.buf = read_sha1_file_extended(sha1, type, &st->size, 0);
+	st->u.incore.buf = read_object_file_extended(oid, type, &st->size, 0);
 	st->u.incore.read_ptr = 0;
 	st->vtbl = &incore_vtbl;
 
@@ -510,7 +510,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
 	ssize_t kept = 0;
 	int result = -1;
 
-	st = open_istream(oid->hash, &type, &sz, filter);
+	st = open_istream(oid, &type, &sz, filter);
 	if (!st) {
 		if (filter)
 			free_stream_filter(filter);
diff --git a/streaming.h b/streaming.h
index 73c1d15..32f4626 100644
--- a/streaming.h
+++ b/streaming.h
@@ -8,7 +8,7 @@
 /* opaque */
 struct git_istream;
 
-extern struct git_istream *open_istream(const unsigned char *, enum object_type *, unsigned long *, struct stream_filter *);
+extern struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *);
 extern int close_istream(struct git_istream *);
 extern ssize_t read_istream(struct git_istream *, void *, size_t);
 
diff --git a/submodule-config.c b/submodule-config.c
index 2aa8a17..3f20757 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -9,7 +9,7 @@
 /*
  * submodule cache lookup structure
  * There is one shared set of 'struct submodule' entries which can be
- * looked up by their sha1 blob id of the .gitmodule file and either
+ * looked up by their sha1 blob id of the .gitmodules file and either
  * using path or name as key.
  * for_path stores submodule entries with path as key
  * for_name stores submodule entries with name as key
@@ -91,7 +91,7 @@ static void submodule_cache_clear(struct submodule_cache *cache)
 	/*
 	 * We iterate over the name hash here to be symmetric with the
 	 * allocation of struct submodule entries. Each is allocated by
-	 * their .gitmodule blob sha1 and submodule name.
+	 * their .gitmodules blob sha1 and submodule name.
 	 */
 	hashmap_iter_init(&cache->for_name, &iter);
 	while ((entry = hashmap_iter_next(&iter)))
@@ -520,7 +520,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 	if (submodule)
 		goto out;
 
-	config = read_sha1_file(oid.hash, &type, &config_size);
+	config = read_object_file(&oid, &type, &config_size);
 	if (!config || type != OBJ_BLOB)
 		goto out;
 
diff --git a/submodule.c b/submodule.c
index b03e5f5..9a50168 100644
--- a/submodule.c
+++ b/submodule.c
@@ -541,9 +541,9 @@ static void show_submodule_header(struct diff_options *o, const char *path,
 
 output_header:
 	strbuf_addf(&sb, "Submodule %s ", path);
-	strbuf_add_unique_abbrev(&sb, one->hash, DEFAULT_ABBREV);
+	strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
 	strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
-	strbuf_add_unique_abbrev(&sb, two->hash, DEFAULT_ABBREV);
+	strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
 	if (message)
 		strbuf_addf(&sb, " %s\n", message);
 	else
@@ -591,7 +591,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
 		unsigned dirty_submodule)
 {
-	const struct object_id *old = the_hash_algo->empty_tree, *new = the_hash_algo->empty_tree;
+	const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
 	struct commit *left = NULL, *right = NULL;
 	struct commit_list *merge_bases = NULL;
 	struct child_process cp = CHILD_PROCESS_INIT;
@@ -606,9 +606,9 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 		goto done;
 
 	if (left)
-		old = one;
+		old_oid = one;
 	if (right)
-		new = two;
+		new_oid = two;
 
 	cp.git_cmd = 1;
 	cp.dir = path;
@@ -631,7 +631,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 		argv_array_pushf(&cp.args, "--dst-prefix=%s%s/",
 				 o->b_prefix, path);
 	}
-	argv_array_push(&cp.args, oid_to_hex(old));
+	argv_array_push(&cp.args, oid_to_hex(old_oid));
 	/*
 	 * If the submodule has modified content, we will diff against the
 	 * work tree, under the assumption that the user has asked for the
@@ -639,7 +639,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 	 * haven't yet been committed to the submodule yet.
 	 */
 	if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
-		argv_array_push(&cp.args, oid_to_hex(new));
+		argv_array_push(&cp.args, oid_to_hex(new_oid));
 
 	prepare_submodule_repo_env(&cp.env_array);
 	if (start_command(&cp))
@@ -818,7 +818,7 @@ static int check_has_commit(const struct object_id *oid, void *data)
 {
 	struct has_commit_data *cb = data;
 
-	enum object_type type = sha1_object_info(oid->hash, NULL);
+	enum object_type type = oid_object_info(oid, NULL);
 
 	switch (type) {
 	case OBJ_COMMIT:
@@ -832,7 +832,7 @@ static int check_has_commit(const struct object_id *oid, void *data)
 		return 0;
 	default:
 		die(_("submodule entry '%s' (%s) is a %s, not a commit"),
-		    cb->path, oid_to_hex(oid), typename(type));
+		    cb->path, oid_to_hex(oid), type_name(type));
 	}
 }
 
@@ -1579,8 +1579,8 @@ static void submodule_reset_index(const char *path)
  * pass NULL for old or new respectively.
  */
 int submodule_move_head(const char *path,
-			 const char *old,
-			 const char *new,
+			 const char *old_head,
+			 const char *new_head,
 			 unsigned flags)
 {
 	int ret = 0;
@@ -1601,7 +1601,7 @@ int submodule_move_head(const char *path,
 	else
 		error_code_ptr = NULL;
 
-	if (old && !is_submodule_populated_gently(path, error_code_ptr))
+	if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
 		return 0;
 
 	sub = submodule_from_path(&null_oid, path);
@@ -1609,14 +1609,14 @@ int submodule_move_head(const char *path,
 	if (!sub)
 		die("BUG: could not get submodule information for '%s'", path);
 
-	if (old && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
+	if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
 		/* Check if the submodule has a dirty index. */
 		if (submodule_has_dirty_index(sub))
 			return error(_("submodule '%s' has dirty index"), path);
 	}
 
 	if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
-		if (old) {
+		if (old_head) {
 			if (!submodule_uses_gitfile(path))
 				absorb_git_dir_into_superproject("", path,
 					ABSORB_GITDIR_RECURSE_SUBMODULES);
@@ -1630,7 +1630,7 @@ int submodule_move_head(const char *path,
 			submodule_reset_index(path);
 		}
 
-		if (old && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
+		if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
 			char *gitdir = xstrfmt("%s/modules/%s",
 				    get_git_common_dir(), sub->name);
 			connect_work_tree_and_git_dir(path, gitdir);
@@ -1659,9 +1659,9 @@ int submodule_move_head(const char *path,
 		argv_array_push(&cp.args, "-m");
 
 	if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
-		argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
+		argv_array_push(&cp.args, old_head ? old_head : EMPTY_TREE_SHA1_HEX);
 
-	argv_array_push(&cp.args, new ? new : EMPTY_TREE_SHA1_HEX);
+	argv_array_push(&cp.args, new_head ? new_head : EMPTY_TREE_SHA1_HEX);
 
 	if (run_command(&cp)) {
 		ret = -1;
@@ -1669,7 +1669,7 @@ int submodule_move_head(const char *path,
 	}
 
 	if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
-		if (new) {
+		if (new_head) {
 			child_process_init(&cp);
 			/* also set the HEAD accordingly */
 			cp.git_cmd = 1;
@@ -1678,7 +1678,7 @@ int submodule_move_head(const char *path,
 
 			prepare_submodule_repo_env(&cp.env_array);
 			argv_array_pushl(&cp.args, "update-ref", "HEAD",
-					 "--no-deref", new, NULL);
+					 "--no-deref", new_head, NULL);
 
 			if (run_command(&cp)) {
 				ret = -1;
diff --git a/submodule.h b/submodule.h
index b9b7ef0..9589f13 100644
--- a/submodule.h
+++ b/submodule.h
@@ -117,7 +117,7 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
 #define SUBMODULE_MOVE_HEAD_FORCE   (1<<1)
 extern int submodule_move_head(const char *path,
 			       const char *old,
-			       const char *new,
+			       const char *new_head,
 			       unsigned flags);
 
 /*
diff --git a/t/README b/t/README
index b3f7b44..24ddebf 100644
--- a/t/README
+++ b/t/README
@@ -84,9 +84,10 @@ appropriately before running "make".
 
 -x::
 	Turn on shell tracing (i.e., `set -x`) during the tests
-	themselves. Implies `--verbose`. Note that in non-bash shells,
-	this can cause failures in some tests which redirect and test
-	the output of shell functions. Use with caution.
+	themselves. Implies `--verbose`.
+	Ignored in test scripts that set the variable 'test_untraceable'
+	to a non-empty value, unless it's run with a Bash version
+	supporting BASH_XTRACEFD, i.e. v4.1 or later.
 
 -d::
 --debug::
@@ -452,6 +453,22 @@ Don't:
    causing the next test to start in an unexpected directory.  Do so
    inside a subshell if necessary.
 
+ - save and verify the standard error of compound commands, i.e. group
+   commands, subshells, and shell functions (except test helper
+   functions like 'test_must_fail') like this:
+
+     ( cd dir && git cmd ) 2>error &&
+     test_cmp expect error
+
+   When running the test with '-x' tracing, then the trace of commands
+   executed in the compound command will be included in standard error
+   as well, quite possibly throwing off the subsequent checks examining
+   the output.  Instead, save only the relevant git command's standard
+   error:
+
+     ( cd dir && git cmd 2>../error ) &&
+     test_cmp expect error
+
  - Break the TAP output
 
    The raw output from your test may be interpreted by a TAP harness. TAP
@@ -655,7 +672,7 @@ library for your script to use.
 		test_expect_code 1 git merge "merge msg" B master
 	'
 
- - test_must_fail <git-command>
+ - test_must_fail [<options>] <git-command>
 
    Run a git command and ensure it fails in a controlled way.  Use
    this instead of "! <git-command>".  When git-command dies due to a
@@ -663,11 +680,21 @@ library for your script to use.
    treats it as just another expected failure, which would let such a
    bug go unnoticed.
 
- - test_might_fail <git-command>
+   Accepts the following options:
+
+     ok=<signal-name>[,<...>]:
+       Don't treat an exit caused by the given signal as error.
+       Multiple signals can be specified as a comma separated list.
+       Currently recognized signal names are: sigpipe, success.
+       (Don't use 'success', use 'test_might_fail' instead.)
+
+ - test_might_fail [<options>] <git-command>
 
    Similar to test_must_fail, but tolerate success, too.  Use this
    instead of "<git-command> || :" to catch failures due to segv.
 
+   Accepts the same options as test_must_fail.
+
  - test_cmp <expected> <actual>
 
    Check whether the content of the <actual> file matches the
diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index f752532..d7c55c2 100644
--- a/t/helper/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -54,8 +54,8 @@ int cmd_main(int ac, const char **av)
 		printf("no untracked cache\n");
 		return 0;
 	}
-	printf("info/exclude %s\n", sha1_to_hex(uc->ss_info_exclude.sha1));
-	printf("core.excludesfile %s\n", sha1_to_hex(uc->ss_excludes_file.sha1));
+	printf("info/exclude %s\n", oid_to_hex(&uc->ss_info_exclude.oid));
+	printf("core.excludesfile %s\n", oid_to_hex(&uc->ss_excludes_file.oid));
 	printf("exclude_per_dir %s\n", uc->exclude_per_dir);
 	printf("flags %08x\n", uc->dir_flags);
 	if (uc->root)
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index 1145d51..9ae9281 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "hashmap.h"
+#include "strbuf.h"
 
 struct test_entry
 {
@@ -29,11 +30,12 @@ static int test_entry_cmp(const void *cmp_data,
 		return strcmp(e1->key, key ? key : e2->key);
 }
 
-static struct test_entry *alloc_test_entry(int hash, char *key, int klen,
-		char *value, int vlen)
+static struct test_entry *alloc_test_entry(unsigned int hash,
+					   char *key, char *value)
 {
-	struct test_entry *entry = malloc(sizeof(struct test_entry) + klen
-			+ vlen + 2);
+	size_t klen = strlen(key);
+	size_t vlen = strlen(value);
+	struct test_entry *entry = xmalloc(st_add4(sizeof(*entry), klen, vlen, 2));
 	hashmap_entry_init(entry, hash);
 	memcpy(entry->key, key, klen + 1);
 	memcpy(entry->key + klen + 1, value, vlen + 1);
@@ -85,11 +87,11 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 	unsigned int *hashes;
 	unsigned int i, j;
 
-	entries = malloc(TEST_SIZE * sizeof(struct test_entry *));
-	hashes = malloc(TEST_SIZE * sizeof(int));
+	ALLOC_ARRAY(entries, TEST_SIZE);
+	ALLOC_ARRAY(hashes, TEST_SIZE);
 	for (i = 0; i < TEST_SIZE; i++) {
-		snprintf(buf, sizeof(buf), "%i", i);
-		entries[i] = alloc_test_entry(0, buf, strlen(buf), "", 0);
+		xsnprintf(buf, sizeof(buf), "%i", i);
+		entries[i] = alloc_test_entry(0, buf, "");
 		hashes[i] = hash(method, i, entries[i]->key);
 	}
 
@@ -144,7 +146,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
  */
 int cmd_main(int argc, const char **argv)
 {
-	char line[1024];
+	struct strbuf line = STRBUF_INIT;
 	struct hashmap map;
 	int icase;
 
@@ -153,44 +155,42 @@ int cmd_main(int argc, const char **argv)
 	hashmap_init(&map, test_entry_cmp, &icase, 0);
 
 	/* process commands from stdin */
-	while (fgets(line, sizeof(line), stdin)) {
+	while (strbuf_getline(&line, stdin) != EOF) {
 		char *cmd, *p1 = NULL, *p2 = NULL;
-		int l1 = 0, l2 = 0, hash = 0;
+		unsigned int hash = 0;
 		struct test_entry *entry;
 
 		/* break line into command and up to two parameters */
-		cmd = strtok(line, DELIM);
+		cmd = strtok(line.buf, DELIM);
 		/* ignore empty lines */
 		if (!cmd || *cmd == '#')
 			continue;
 
 		p1 = strtok(NULL, DELIM);
 		if (p1) {
-			l1 = strlen(p1);
 			hash = icase ? strihash(p1) : strhash(p1);
 			p2 = strtok(NULL, DELIM);
-			if (p2)
-				l2 = strlen(p2);
 		}
 
-		if (!strcmp("hash", cmd) && l1) {
+		if (!strcmp("hash", cmd) && p1) {
 
 			/* print results of different hash functions */
-			printf("%u %u %u %u\n", strhash(p1), memhash(p1, l1),
-					strihash(p1), memihash(p1, l1));
+			printf("%u %u %u %u\n",
+			       strhash(p1), memhash(p1, strlen(p1)),
+			       strihash(p1), memihash(p1, strlen(p1)));
 
-		} else if (!strcmp("add", cmd) && l1 && l2) {
+		} else if (!strcmp("add", cmd) && p1 && p2) {
 
 			/* create entry with key = p1, value = p2 */
-			entry = alloc_test_entry(hash, p1, l1, p2, l2);
+			entry = alloc_test_entry(hash, p1, p2);
 
 			/* add to hashmap */
 			hashmap_add(&map, entry);
 
-		} else if (!strcmp("put", cmd) && l1 && l2) {
+		} else if (!strcmp("put", cmd) && p1 && p2) {
 
 			/* create entry with key = p1, value = p2 */
-			entry = alloc_test_entry(hash, p1, l1, p2, l2);
+			entry = alloc_test_entry(hash, p1, p2);
 
 			/* add / replace entry */
 			entry = hashmap_put(&map, entry);
@@ -199,7 +199,7 @@ int cmd_main(int argc, const char **argv)
 			puts(entry ? get_value(entry) : "NULL");
 			free(entry);
 
-		} else if (!strcmp("get", cmd) && l1) {
+		} else if (!strcmp("get", cmd) && p1) {
 
 			/* lookup entry in hashmap */
 			entry = hashmap_get_from_hash(&map, hash, p1);
@@ -212,7 +212,7 @@ int cmd_main(int argc, const char **argv)
 				entry = hashmap_get_next(&map, entry);
 			}
 
-		} else if (!strcmp("remove", cmd) && l1) {
+		} else if (!strcmp("remove", cmd) && p1) {
 
 			/* setup static key */
 			struct hashmap_entry key;
@@ -238,7 +238,7 @@ int cmd_main(int argc, const char **argv)
 			printf("%u %u\n", map.tablesize,
 			       hashmap_get_size(&map));
 
-		} else if (!strcmp("intern", cmd) && l1) {
+		} else if (!strcmp("intern", cmd) && p1) {
 
 			/* test that strintern works */
 			const char *i1 = strintern(p1);
@@ -252,7 +252,7 @@ int cmd_main(int argc, const char **argv)
 			else
 				printf("%s\n", i1);
 
-		} else if (!strcmp("perfhashmap", cmd) && l1 && l2) {
+		} else if (!strcmp("perfhashmap", cmd) && p1 && p2) {
 
 			perf_hashmap(atoi(p1), atoi(p2));
 
@@ -263,6 +263,7 @@ int cmd_main(int argc, const char **argv)
 		}
 	}
 
+	strbuf_release(&line);
 	hashmap_free(&map, 1);
 	return 0;
 }
diff --git a/t/helper/test-wildmatch.c b/t/helper/test-wildmatch.c
index 921d7b3..66d33df 100644
--- a/t/helper/test-wildmatch.c
+++ b/t/helper/test-wildmatch.c
@@ -16,6 +16,8 @@ int cmd_main(int argc, const char **argv)
 		return !!wildmatch(argv[3], argv[2], WM_PATHNAME | WM_CASEFOLD);
 	else if (!strcmp(argv[1], "pathmatch"))
 		return !!wildmatch(argv[3], argv[2], 0);
+	else if (!strcmp(argv[1], "ipathmatch"))
+		return !!wildmatch(argv[3], argv[2], WM_CASEFOLD);
 	else
 		return 1;
 }
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh
index cd220e3..e3809dc 100644
--- a/t/lib-terminal.sh
+++ b/t/lib-terminal.sh
@@ -9,8 +9,8 @@ test_terminal () {
 		echo >&4 "test_terminal: need to declare TTY prerequisite"
 		return 127
 	fi
-	perl "$TEST_DIRECTORY"/test-terminal.perl "$@"
-}
+	perl "$TEST_DIRECTORY"/test-terminal.perl "$@" 2>&7
+} 7>&2 2>&4
 
 test_lazy_prereq TTY '
 	test_have_prereq PERL &&
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 3a0917f..48637ef 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -36,7 +36,8 @@ sub format_times {
 	return $out;
 }
 
-my (@dirs, %dirnames, %dirabbrevs, %prefixes, @tests, $codespeed);
+my (@dirs, %dirnames, %dirabbrevs, %prefixes, @tests,
+    $codespeed, $sortby, $subsection, $reponame);
 while (scalar @ARGV) {
 	my $arg = $ARGV[0];
 	my $dir;
@@ -45,6 +46,36 @@ while (scalar @ARGV) {
 		shift @ARGV;
 		next;
 	}
+	if ($arg =~ /--sort-by(?:=(.*))?/) {
+		shift @ARGV;
+		if (defined $1) {
+			$sortby = $1;
+		} else {
+			$sortby = shift @ARGV;
+			if (! defined $sortby) {
+				die "'--sort-by' requires an argument";
+			}
+		}
+		next;
+	}
+	if ($arg eq "--subsection") {
+		shift @ARGV;
+		$subsection = $ARGV[0];
+		shift @ARGV;
+		if (! $subsection) {
+			die "empty subsection";
+		}
+		next;
+	}
+	if ($arg eq "--reponame") {
+		shift @ARGV;
+		$reponame = $ARGV[0];
+		shift @ARGV;
+		if (! $reponame) {
+			die "empty reponame";
+		}
+		next;
+	}
 	last if -f $arg or $arg eq "--";
 	if (! -d $arg) {
 		my $rev = Git::command_oneline(qw(rev-parse --verify), $arg);
@@ -76,10 +107,15 @@ if (not @tests) {
 }
 
 my $resultsdir = "test-results";
-my $results_section = "";
-if (exists $ENV{GIT_PERF_SUBSECTION} and $ENV{GIT_PERF_SUBSECTION} ne "") {
-	$resultsdir .= "/" . $ENV{GIT_PERF_SUBSECTION};
-	$results_section = $ENV{GIT_PERF_SUBSECTION};
+
+if (! $subsection and
+    exists $ENV{GIT_PERF_SUBSECTION} and
+    $ENV{GIT_PERF_SUBSECTION} ne "") {
+	$subsection = $ENV{GIT_PERF_SUBSECTION};
+}
+
+if ($subsection) {
+	$resultsdir .= "/" . $subsection;
 }
 
 my @subtests;
@@ -123,6 +159,11 @@ sub have_slash {
 	return 0;
 }
 
+sub display_dir {
+	my ($d) = @_;
+	return exists $dirabbrevs{$d} ? $dirabbrevs{$d} : $dirnames{$d};
+}
+
 sub print_default_results {
 	my %descrs;
 	my $descrlen = 4; # "Test"
@@ -144,8 +185,7 @@ sub print_default_results {
 	my %times;
 	my @colwidth = ((0)x@dirs);
 	for my $i (0..$#dirs) {
-		my $d = $dirs[$i];
-		my $w = length (exists $dirabbrevs{$d} ? $dirabbrevs{$d} : $dirnames{$d});
+		my $w = length display_dir($dirs[$i]);
 		$colwidth[$i] = $w if $w > $colwidth[$i];
 	}
 	for my $t (@subtests) {
@@ -164,8 +204,7 @@ sub print_default_results {
 
 	printf "%-${descrlen}s", "Test";
 	for my $i (0..$#dirs) {
-		my $d = $dirs[$i];
-		printf "   %-$colwidth[$i]s", (exists $dirabbrevs{$d} ? $dirabbrevs{$d} : $dirnames{$d});
+		printf "   %-$colwidth[$i]s", display_dir($dirs[$i]);
 	}
 	print "\n";
 	print "-"x$totalwidth, "\n";
@@ -182,20 +221,65 @@ sub print_default_results {
 	}
 }
 
+sub print_sorted_results {
+	my ($sortby) = @_;
+
+	if ($sortby ne "regression") {
+		die "only 'regression' is supported as '--sort-by' argument";
+	}
+
+	my @evolutions;
+	for my $t (@subtests) {
+		my ($prevr, $prevu, $prevs, $prevrev);
+		for my $i (0..$#dirs) {
+			my $d = $dirs[$i];
+			my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
+			if ($i > 0 and defined $r and defined $prevr and $prevr > 0) {
+				my $percent = 100.0 * ($r - $prevr) / $prevr;
+				push @evolutions, { "percent"  => $percent,
+						    "test"     => $t,
+						    "prevrev"  => $prevrev,
+						    "rev"      => $d,
+						    "prevr"    => $prevr,
+						    "r"        => $r,
+						    "prevu"    => $prevu,
+						    "u"        => $u,
+						    "prevs"    => $prevs,
+						    "s"        => $s};
+			}
+			($prevr, $prevu, $prevs, $prevrev) = ($r, $u, $s, $d);
+		}
+	}
+
+	my @sorted_evolutions = sort { $b->{percent} <=> $a->{percent} } @evolutions;
+
+	for my $e (@sorted_evolutions) {
+		printf "%+.1f%%", $e->{percent};
+		print " " . $e->{test};
+		print " " . format_times($e->{prevr}, $e->{prevu}, $e->{prevs});
+		print " " . format_times($e->{r}, $e->{u}, $e->{s});
+		print " " . display_dir($e->{prevrev});
+		print " " . display_dir($e->{rev});
+		print "\n";
+	}
+}
+
 sub print_codespeed_results {
-	my ($results_section) = @_;
+	my ($subsection) = @_;
 
 	my $project = "Git";
 
 	my $executable = `uname -s -m`;
 	chomp $executable;
 
-	if ($results_section ne "") {
-		$executable .= ", " . $results_section;
+	if ($subsection) {
+		$executable .= ", " . $subsection;
 	}
 
 	my $environment;
-	if (exists $ENV{GIT_PERF_REPO_NAME} and $ENV{GIT_PERF_REPO_NAME} ne "") {
+	if ($reponame) {
+		$environment = $reponame;
+	} elsif (exists $ENV{GIT_PERF_REPO_NAME} and $ENV{GIT_PERF_REPO_NAME} ne "") {
 		$environment = $ENV{GIT_PERF_REPO_NAME};
 	} elsif (exists $ENV{GIT_TEST_INSTALLED} and $ENV{GIT_TEST_INSTALLED} ne "") {
 		$environment = $ENV{GIT_TEST_INSTALLED};
@@ -227,13 +311,15 @@ sub print_codespeed_results {
 		}
 	}
 
-	print to_json(\@data, {utf8 => 1, pretty => 1}), "\n";
+	print to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
 }
 
 binmode STDOUT, ":utf8" or die "PANIC on binmode: $!";
 
 if ($codespeed) {
-	print_codespeed_results($results_section);
+	print_codespeed_results($subsection);
+} elsif (defined $sortby) {
+	print_sorted_results($sortby);
 } else {
 	print_default_results();
 }
diff --git a/t/perf/run b/t/perf/run
index 1a100d6..213da5d 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -106,7 +106,6 @@ get_var_from_env_or_config () {
 	conf_sec="$2"
 	conf_var="$3"
 	conf_opts="$4" # optional
-	# $5 can be set to a default value
 
 	# Do nothing if the env variable is already set
 	eval "test -z \"\${$env_var+x}\"" || return
@@ -122,13 +121,12 @@ get_var_from_env_or_config () {
 	fi
 	var="$conf_sec.$conf_var"
 	conf_value=$(git config $conf_opts -f "$GIT_PERF_CONFIG_FILE" "$var") &&
-	eval "$env_var=\"$conf_value\"" && return
-
-	test -n "${5+x}" && eval "$env_var=\"$5\""
+	eval "$env_var=\"$conf_value\""
 }
 
 run_subsection () {
-	get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int" 3
+	get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int"
+	: ${GIT_PERF_REPEAT_COUNT:=3}
 	export GIT_PERF_REPEAT_COUNT
 
 	get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs"
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 9670e8c..3691023 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -10,15 +10,6 @@ objpath() {
 	echo "$1" | sed -e 's|\(..\)|\1/|'
 }
 
-objck() {
-	p=$(objpath "$1")
-	if test ! -f "$REAL/objects/$p"
-	then
-		echo "Object not found: $REAL/objects/$p"
-		false
-	fi
-}
-
 test_expect_success 'initial setup' '
 	REAL="$(pwd)/.real" &&
 	mv .git "$REAL"
@@ -26,30 +17,14 @@ test_expect_success 'initial setup' '
 
 test_expect_success 'bad setup: invalid .git file format' '
 	echo "gitdir $REAL" >.git &&
-	if git rev-parse 2>.err
-	then
-		echo "git rev-parse accepted an invalid .git file"
-		false
-	fi &&
-	if ! grep "Invalid gitfile format" .err
-	then
-		echo "git rev-parse returned wrong error"
-		false
-	fi
+	test_must_fail git rev-parse 2>.err &&
+	test_i18ngrep "invalid gitfile format" .err
 '
 
 test_expect_success 'bad setup: invalid .git file path' '
 	echo "gitdir: $REAL.not" >.git &&
-	if git rev-parse 2>.err
-	then
-		echo "git rev-parse accepted an invalid .git file path"
-		false
-	fi &&
-	if ! grep "Not a git repository" .err
-	then
-		echo "git rev-parse returned wrong error"
-		false
-	fi
+	test_must_fail git rev-parse 2>.err &&
+	test_i18ngrep "not a git repository" .err
 '
 
 test_expect_success 'final setup + check rev-parse --git-dir' '
@@ -60,7 +35,7 @@ test_expect_success 'final setup + check rev-parse --git-dir' '
 test_expect_success 'check hash-object' '
 	echo "foo" >bar &&
 	SHA=$(cat bar | git hash-object -w --stdin) &&
-	objck $SHA
+	test_path_is_file "$REAL/objects/$(objpath $SHA)"
 '
 
 test_expect_success 'check cat-file' '
@@ -69,29 +44,21 @@ test_expect_success 'check cat-file' '
 '
 
 test_expect_success 'check update-index' '
-	if test -f "$REAL/index"
-	then
-		echo "Hmm, $REAL/index exists?"
-		false
-	fi &&
+	test_path_is_missing "$REAL/index" &&
 	rm -f "$REAL/objects/$(objpath $SHA)" &&
 	git update-index --add bar &&
-	if ! test -f "$REAL/index"
-	then
-		echo "$REAL/index not found"
-		false
-	fi &&
-	objck $SHA
+	test_path_is_file "$REAL/index" &&
+	test_path_is_file "$REAL/objects/$(objpath $SHA)"
 '
 
 test_expect_success 'check write-tree' '
 	SHA=$(git write-tree) &&
-	objck $SHA
+	test_path_is_file "$REAL/objects/$(objpath $SHA)"
 '
 
 test_expect_success 'check commit-tree' '
 	SHA=$(echo "commit bar" | git commit-tree $SHA) &&
-	objck $SHA
+	test_path_is_file "$REAL/objects/$(objpath $SHA)"
 '
 
 test_expect_success 'check rev-list' '
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index d27f438..c03f155 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -307,7 +307,7 @@ test_expect_success_multi 'needs work tree' '' '
 		cd .git &&
 		test_check_ignore "foo" 128
 	) &&
-	stderr_contains "fatal: This operation must be run in a work tree"
+	stderr_contains "fatal: this operation must be run in a work tree"
 '
 
 ############################################################################
@@ -775,6 +775,26 @@ test_expect_success PIPE 'streaming support for --stdin' '
 	echo "$response" | grep "^::	two"
 '
 
+test_expect_success 'existing file and directory' '
+	test_when_finished "rm one" &&
+	test_when_finished "rmdir top-level-dir" &&
+	>one &&
+	mkdir top-level-dir &&
+	git check-ignore one top-level-dir >actual &&
+	grep one actual &&
+	grep top-level-dir actual
+'
+
+test_expect_success 'existing directory and file' '
+	test_when_finished "rm one" &&
+	test_when_finished "rmdir top-level-dir" &&
+	>one &&
+	mkdir top-level-dir &&
+	git check-ignore top-level-dir one >actual &&
+	grep one actual &&
+	grep top-level-dir actual
+'
+
 ############################################################################
 #
 # test whitespace handling
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 0c2fc81..04d474c 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -291,7 +291,7 @@ test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
 test_expect_success 'OPT_CALLBACK() and callback errors work' '
 	test_must_fail test-parse-options --no-length >output 2>output.err &&
 	test_i18ncmp expect output &&
-	test_i18ncmp expect.err output.err
+	test_must_be_empty output.err
 '
 
 cat >expect <<\EOF
diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh
new file mode 100755
index 0000000..5b927b7
--- /dev/null
+++ b/t/t0041-usage.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+test_description='Test commands behavior when given invalid argument value'
+
+. ./test-lib.sh
+
+test_expect_success 'setup ' '
+	test_commit "v1.0"
+'
+
+test_expect_success 'tag --contains <existent_tag>' '
+	git tag --contains "v1.0" >actual 2>actual.err &&
+	grep "v1.0" actual &&
+	test_line_count = 0 actual.err
+'
+
+test_expect_success 'tag --contains <inexistent_tag>' '
+	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+'
+
+test_expect_success 'tag --no-contains <existent_tag>' '
+	git tag --no-contains "v1.0" >actual 2>actual.err  &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+'
+
+test_expect_success 'tag --no-contains <inexistent_tag>' '
+	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+'
+
+test_expect_success 'tag usage error' '
+	test_must_fail git tag --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "usage" actual.err
+'
+
+test_expect_success 'branch --contains <existent_commit>' '
+	git branch --contains "master" >actual 2>actual.err &&
+	test_i18ngrep "master" actual &&
+	test_line_count = 0 actual.err
+'
+
+test_expect_success 'branch --contains <inexistent_commit>' '
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+'
+
+test_expect_success 'branch --no-contains <existent_commit>' '
+	git branch --no-contains "master" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+'
+
+test_expect_success 'branch --no-contains <inexistent_commit>' '
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+'
+
+test_expect_success 'branch usage error' '
+	test_must_fail git branch --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "usage" actual.err
+'
+
+test_expect_success 'for-each-ref --contains <existent_object>' '
+	git for-each-ref --contains "master" >actual 2>actual.err &&
+	test_line_count = 2 actual &&
+	test_line_count = 0 actual.err
+'
+
+test_expect_success 'for-each-ref --contains <inexistent_object>' '
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+'
+
+test_expect_success 'for-each-ref --no-contains <existent_object>' '
+	git for-each-ref --no-contains "master" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+'
+
+test_expect_success 'for-each-ref --no-contains <inexistent_object>' '
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+'
+
+test_expect_success 'for-each-ref usage error' '
+	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "usage" actual.err
+'
+
+test_done
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index b29d749..192c94e 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -80,7 +80,21 @@ test_expect_success 'merge (case change)' '
 	git merge topic
 '
 
-
+test_expect_success CASE_INSENSITIVE_FS 'add directory (with different case)' '
+	git reset --hard initial &&
+	mkdir -p dir1/dir2 &&
+	echo >dir1/dir2/a &&
+	echo >dir1/dir2/b &&
+	git add dir1/dir2/a &&
+	git add dir1/DIR2/b &&
+	git ls-files >actual &&
+	cat >expected <<-\EOF &&
+		camelcase
+		dir1/dir2/a
+		dir1/dir2/b
+	EOF
+	test_cmp expected actual
+'
 
 test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '
 	git reset --hard initial &&
diff --git a/t/t0205-gettext-poison.sh b/t/t0205-gettext-poison.sh
index 2361590..438e778 100755
--- a/t/t0205-gettext-poison.sh
+++ b/t/t0205-gettext-poison.sh
@@ -7,10 +7,6 @@ test_description='Gettext Shell poison'
 
 . ./lib-gettext.sh
 
-test_expect_success GETTEXT_POISON "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
-    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-'
-
 test_expect_success GETTEXT_POISON 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
     test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
 '
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index c167f60..0c6f48f 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -15,8 +15,11 @@ test_description='sparse checkout tests
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
 test_expect_success 'setup' '
+	test_commit init &&
+	echo modified >>init.t &&
+
 	cat >expected <<-EOF &&
-	100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0	init.t
+	100644 $(git hash-object init.t) 0	init.t
 	100644 $EMPTY_BLOB 0	sub/added
 	100644 $EMPTY_BLOB 0	sub/addedtoo
 	100644 $EMPTY_BLOB 0	subsub/added
@@ -28,8 +31,6 @@ test_expect_success 'setup' '
 	H subsub/added
 	EOF
 
-	test_commit init &&
-	echo modified >>init.t &&
 	mkdir sub subsub &&
 	touch sub/added sub/addedtoo subsub/added &&
 	git add init.t sub/added sub/addedtoo subsub/added &&
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index cbeb9be..dc7e6c2 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1206,6 +1206,29 @@ test_expect_success 'git -c is not confused by empty environment' '
 	GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
 '
 
+sq="'"
+test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
+	cat >expect <<-\EOF &&
+	env.one one
+	env.two two
+	EOF
+	GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq} ${sq}env.two=two${sq}" \
+		git config --get-regexp "env.*" >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-EOF &&
+	env.one one${sq}
+	env.two two
+	EOF
+	GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq$sq$sq ${sq}env.two=two${sq}" \
+		git config --get-regexp "env.*" >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail env \
+		GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq ${sq}env.two=two${sq}" \
+		git config --get-regexp "env.*"
+'
+
 test_expect_success 'git config --edit works' '
 	git config -f tmp test.value no &&
 	echo test.value=yes >expect &&
@@ -1564,10 +1587,10 @@ test_expect_success '--show-origin stdin with file include' '
 '
 
 test_expect_success !MINGW '--show-origin blob' '
-	cat >expect <<-\EOF &&
-		blob:a9d9f9e555b5c6f07cbe09d3f06fe3df11e09c08	user.custom=true
-	EOF
 	blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
+	cat >expect <<-EOF &&
+		blob:$blob	user.custom=true
+	EOF
 	git config --blob=$blob --show-origin --list >output &&
 	test_cmp expect output
 '
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index f5422f1..335d3f3 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -54,7 +54,7 @@ test_expect_success SETFACL 'Setup test repo' '
 
 test_expect_success SETFACL 'Objects creation does not break ACLs with restrictive umask' '
 	# SHA1 for empty blob
-	check_perms_and_acl .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+	check_perms_and_acl .git/objects/$(echo $EMPTY_BLOB | sed -e "s,^\(..\),\1/,")
 '
 
 test_expect_success SETFACL 'git gc does not break ACLs with restrictive umask' '
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index e8115df..a1e243a 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -45,7 +45,7 @@ test_expect_success 'rename_refs(master, new-master)' '
 '
 
 test_expect_success 'for_each_ref(refs/heads/)' '
-	$RUN for-each-ref refs/heads/ | cut -c 42- >actual &&
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
 	cat >expected <<-\EOF &&
 	master 0x0
 	new-master 0x0
@@ -71,7 +71,7 @@ test_expect_success 'verify_ref(new-master)' '
 '
 
 test_expect_success 'for_each_reflog()' '
-	$RUN for-each-reflog | sort | cut -c 42- >actual &&
+	$RUN for-each-reflog | sort -k2 | cut -c 42- >actual &&
 	cat >expected <<-\EOF &&
 	HEAD 0x1
 	refs/heads/master 0x0
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 6ac7734..5969077 100755
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -10,6 +10,7 @@ test_expect_success 'setup' '
 	git commit -m one
 '
 
+commit=$(git rev-parse --short HEAD)
 cat >expect <<'EOF'
 Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
 Reflog message: commit (initial): one
@@ -20,8 +21,8 @@ test_expect_success 'log -g shows reflog headers' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
-e46513e HEAD@{0}: commit (initial): one
+cat >expect <<EOF
+$commit HEAD@{0}: commit (initial): one
 EOF
 test_expect_success 'oneline reflog format' '
 	git log -g -1 --oneline >actual &&
@@ -33,8 +34,8 @@ test_expect_success 'reflog default format' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
-commit e46513e
+cat >expect <<EOF
+commit $commit
 Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
 Reflog message: commit (initial): one
 Author: A U Thor <author@example.com>
@@ -56,8 +57,8 @@ test_expect_success 'using @{now} syntax shows reflog date (multiline)' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
-e46513e HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
+cat >expect <<EOF
+$commit HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
 EOF
 test_expect_success 'using @{now} syntax shows reflog date (oneline)' '
 	git log -g -1 --oneline HEAD@{now} >actual &&
@@ -82,8 +83,8 @@ test_expect_success 'using --date= shows reflog date (multiline)' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
-e46513e HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
+cat >expect <<EOF
+$commit HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
 EOF
 test_expect_success 'using --date= shows reflog date (oneline)' '
 	git log -g -1 --oneline --date=default >actual &&
@@ -109,8 +110,8 @@ test_expect_success 'log.date does not invoke "--date" magic (multiline)' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
-e46513e HEAD@{0}: commit (initial): one
+cat >expect <<EOF
+$commit HEAD@{0}: commit (initial): one
 EOF
 test_expect_success 'log.date does not invoke "--date" magic (oneline)' '
 	test_config log.date raw &&
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 79a0251..4ee009d 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -157,7 +157,7 @@ test_expect_success 'relative path not found' '
 test_expect_success 'relative path outside worktree' '
 	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
 	test -z "$(cat output)" &&
-	grep "outside repository" error
+	test_i18ngrep "outside repository" error
 '
 
 test_expect_success 'relative path when cwd is outside worktree' '
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index b23c4e3..93c77ea 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -42,7 +42,7 @@ commit_subject () {
 
 error_message () {
 	(cd clone &&
-	 test_must_fail git rev-parse --verify "$@")
+	 test_must_fail git rev-parse --verify "$@" 2>../error)
 }
 
 test_expect_success '@{upstream} resolves to correct full name' '
@@ -159,8 +159,8 @@ test_expect_success 'branch@{u} error message when no upstream' '
 	cat >expect <<-EOF &&
 	fatal: no upstream configured for branch ${sq}non-tracking${sq}
 	EOF
-	error_message non-tracking@{u} 2>actual &&
-	test_i18ncmp expect actual
+	error_message non-tracking@{u} &&
+	test_i18ncmp expect error
 '
 
 test_expect_success '@{u} error message when no upstream' '
@@ -175,8 +175,8 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
 	cat >expect <<-EOF &&
 	fatal: no such branch: ${sq}no-such-branch${sq}
 	EOF
-	error_message no-such-branch@{u} 2>actual &&
-	test_i18ncmp expect actual
+	error_message no-such-branch@{u} &&
+	test_i18ncmp expect error
 '
 
 test_expect_success '@{u} error message when not on a branch' '
@@ -192,8 +192,8 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
 	cat >expect <<-EOF &&
 	fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
 	EOF
-	error_message bad-upstream@{u} 2>actual &&
-	test_i18ncmp expect actual
+	error_message bad-upstream@{u} &&
+	test_i18ncmp expect error
 '
 
 test_expect_success 'pull works when tracking a local branch' '
@@ -209,8 +209,9 @@ test_expect_success '@{u} works when tracking a local branch' '
 	test refs/heads/master = "$(full_name @{u})"
 '
 
+commit=$(git rev-parse HEAD)
 cat >expect <<EOF
-commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
+commit $commit
 Reflog: master@{0} (C O Mitter <committer@example.com>)
 Reflog message: branch: Created from HEAD
 Author: A U Thor <author@example.com>
@@ -224,7 +225,7 @@ test_expect_success 'log -g other@{u}' '
 '
 
 cat >expect <<EOF
-commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
+commit $commit
 Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
 Reflog message: branch: Created from HEAD
 Author: A U Thor <author@example.com>
diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index 13ae12d..e6854b8 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -39,6 +39,10 @@ A few rules for repo setup:
 11. When user's cwd is outside worktree, cwd remains unchanged,
     prefix is NULL.
 "
+
+# This test heavily relies on the standard error of nested function calls.
+test_untraceable=UnfortunatelyYes
+
 . ./test-lib.sh
 
 here=$(pwd)
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index bb4f2e0..1fa6706 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -189,8 +189,12 @@ test_expect_success 'no advice given for explicit detached head state' '
 # Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (new format)
 test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not asked to' "
 
+	commit=$(git rev-parse --short=12 master^) &&
+	commit2=$(git rev-parse --short=12 master~2) &&
+	commit3=$(git rev-parse --short=12 master~3) &&
+
 	# The first detach operation is more chatty than the following ones.
-	cat >1st_detach <<-'EOF' &&
+	cat >1st_detach <<-EOF &&
 	Note: checking out 'HEAD^'.
 
 	You are in 'detached HEAD' state. You can look around, make experimental
@@ -202,18 +206,18 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 
 	  git checkout -b <new-branch-name>
 
-	HEAD is now at 7c7cd714e262 three
+	HEAD is now at \$commit three
 	EOF
 
 	# The remaining ones just show info about previous and current HEADs.
-	cat >2nd_detach <<-'EOF' &&
-	Previous HEAD position was 7c7cd714e262 three
-	HEAD is now at 139b20d8e6c5 two
+	cat >2nd_detach <<-EOF &&
+	Previous HEAD position was \$commit three
+	HEAD is now at \$commit2 two
 	EOF
 
-	cat >3rd_detach <<-'EOF' &&
-	Previous HEAD position was 139b20d8e6c5 two
-	HEAD is now at d79ce1670bdc one
+	cat >3rd_detach <<-EOF &&
+	Previous HEAD position was \$commit2 two
+	HEAD is now at \$commit3 one
 	EOF
 
 	reset &&
@@ -261,8 +265,12 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 # Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (old format)
 test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked to' "
 
+	commit=$(git rev-parse --short=12 master^) &&
+	commit2=$(git rev-parse --short=12 master~2) &&
+	commit3=$(git rev-parse --short=12 master~3) &&
+
 	# The first detach operation is more chatty than the following ones.
-	cat >1st_detach <<-'EOF' &&
+	cat >1st_detach <<-EOF &&
 	Note: checking out 'HEAD^'.
 
 	You are in 'detached HEAD' state. You can look around, make experimental
@@ -274,18 +282,18 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
 
 	  git checkout -b <new-branch-name>
 
-	HEAD is now at 7c7cd714e262... three
+	HEAD is now at \$commit... three
 	EOF
 
 	# The remaining ones just show info about previous and current HEADs.
-	cat >2nd_detach <<-'EOF' &&
-	Previous HEAD position was 7c7cd714e262... three
-	HEAD is now at 139b20d8e6c5... two
+	cat >2nd_detach <<-EOF &&
+	Previous HEAD position was \$commit... three
+	HEAD is now at \$commit2... two
 	EOF
 
-	cat >3rd_detach <<-'EOF' &&
-	Previous HEAD position was 139b20d8e6c5... two
-	HEAD is now at d79ce1670bdc... one
+	cat >3rd_detach <<-EOF &&
+	Previous HEAD position was \$commit2... two
+	HEAD is now at \$commit3... one
 	EOF
 
 	reset &&
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index 2b95944..d0d2e4f 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -451,32 +451,68 @@ test_expect_success 'git worktree --no-guess-remote option overrides config' '
 '
 
 post_checkout_hook () {
-	test_when_finished "rm -f .git/hooks/post-checkout" &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/post-checkout <<-\EOF
-	echo $* >hook.actual
+	gitdir=${1:-.git}
+	test_when_finished "rm -f $gitdir/hooks/post-checkout" &&
+	mkdir -p $gitdir/hooks &&
+	write_script $gitdir/hooks/post-checkout <<-\EOF
+	{
+		echo $*
+		git rev-parse --git-dir --show-toplevel
+	} >hook.actual
 	EOF
 }
 
 test_expect_success '"add" invokes post-checkout hook (branch)' '
 	post_checkout_hook &&
-	printf "%s %s 1\n" $_z40 $(git rev-parse HEAD) >hook.expect &&
+	{
+		echo $_z40 $(git rev-parse HEAD) 1 &&
+		echo $(pwd)/.git/worktrees/gumby &&
+		echo $(pwd)/gumby
+	} >hook.expect &&
 	git worktree add gumby &&
-	test_cmp hook.expect hook.actual
+	test_cmp hook.expect gumby/hook.actual
 '
 
 test_expect_success '"add" invokes post-checkout hook (detached)' '
 	post_checkout_hook &&
-	printf "%s %s 1\n" $_z40 $(git rev-parse HEAD) >hook.expect &&
+	{
+		echo $_z40 $(git rev-parse HEAD) 1 &&
+		echo $(pwd)/.git/worktrees/grumpy &&
+		echo $(pwd)/grumpy
+	} >hook.expect &&
 	git worktree add --detach grumpy &&
-	test_cmp hook.expect hook.actual
+	test_cmp hook.expect grumpy/hook.actual
 '
 
 test_expect_success '"add --no-checkout" suppresses post-checkout hook' '
 	post_checkout_hook &&
 	rm -f hook.actual &&
 	git worktree add --no-checkout gloopy &&
-	test_path_is_missing hook.actual
+	test_path_is_missing gloopy/hook.actual
+'
+
+test_expect_success '"add" in other worktree invokes post-checkout hook' '
+	post_checkout_hook &&
+	{
+		echo $_z40 $(git rev-parse HEAD) 1 &&
+		echo $(pwd)/.git/worktrees/guppy &&
+		echo $(pwd)/guppy
+	} >hook.expect &&
+	git -C gloopy worktree add --detach ../guppy &&
+	test_cmp hook.expect guppy/hook.actual
+'
+
+test_expect_success '"add" in bare repo invokes post-checkout hook' '
+	rm -rf bare &&
+	git clone --bare . bare &&
+	{
+		echo $_z40 $(git --git-dir=bare rev-parse HEAD) 1 &&
+		echo $(pwd)/bare/worktrees/goozy &&
+		echo $(pwd)/goozy
+	} >hook.expect &&
+	post_checkout_hook bare &&
+	git -C bare worktree add --detach ../goozy &&
+	test_cmp hook.expect goozy/hook.actual
 '
 
 test_done
diff --git a/t/t2026-worktree-prune.sh b/t/t2026-worktree-prune.sh
index a0f1e3b..b7d6d5d 100755
--- a/t/t2026-worktree-prune.sh
+++ b/t/t2026-worktree-prune.sh
@@ -78,10 +78,9 @@ test_expect_success 'not prune locked checkout' '
 
 test_expect_success 'not prune recent checkouts' '
 	test_when_finished rm -r .git/worktrees &&
-	mkdir zz &&
-	mkdir -p .git/worktrees/jlm &&
-	echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir &&
-	rmdir zz &&
+	git worktree add jlm HEAD &&
+	test -d .git/worktrees/jlm &&
+	rm -rf jlm &&
 	git worktree prune --verbose --expire=2.days.ago &&
 	test -d .git/worktrees/jlm
 '
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
index 8298aaf..5d5b363 100755
--- a/t/t2028-worktree-move.sh
+++ b/t/t2028-worktree-move.sh
@@ -7,7 +7,8 @@ test_description='test git worktree move, remove, lock and unlock'
 test_expect_success 'setup' '
 	test_commit init &&
 	git worktree add source &&
-	git worktree list --porcelain | grep "^worktree" >actual &&
+	git worktree list --porcelain >out &&
+	grep "^worktree" out >actual &&
 	cat <<-EOF >expected &&
 	worktree $(pwd)
 	worktree $(pwd)/source
@@ -59,4 +60,86 @@ test_expect_success 'unlock worktree twice' '
 	test_path_is_missing .git/worktrees/source/locked
 '
 
+test_expect_success 'move non-worktree' '
+	mkdir abc &&
+	test_must_fail git worktree move abc def
+'
+
+test_expect_success 'move locked worktree' '
+	git worktree lock source &&
+	test_when_finished "git worktree unlock source" &&
+	test_must_fail git worktree move source destination
+'
+
+test_expect_success 'move worktree' '
+	toplevel="$(pwd)" &&
+	git worktree move source destination &&
+	test_path_is_missing source &&
+	git worktree list --porcelain >out &&
+	grep "^worktree.*/destination" out &&
+	! grep "^worktree.*/source" out &&
+	git -C destination log --format=%s >actual2 &&
+	echo init >expected2 &&
+	test_cmp expected2 actual2
+'
+
+test_expect_success 'move main worktree' '
+	test_must_fail git worktree move . def
+'
+
+test_expect_success 'move worktree to another dir' '
+	mkdir some-dir &&
+	git worktree move destination some-dir &&
+	test_when_finished "git worktree move some-dir/destination destination" &&
+	test_path_is_missing destination &&
+	git worktree list --porcelain >out &&
+	grep "^worktree.*/some-dir/destination" out &&
+	git -C some-dir/destination log --format=%s >actual2 &&
+	echo init >expected2 &&
+	test_cmp expected2 actual2
+'
+
+test_expect_success 'remove main worktree' '
+	test_must_fail git worktree remove .
+'
+
+test_expect_success 'remove locked worktree' '
+	git worktree lock destination &&
+	test_when_finished "git worktree unlock destination" &&
+	test_must_fail git worktree remove destination
+'
+
+test_expect_success 'remove worktree with dirty tracked file' '
+	echo dirty >>destination/init.t &&
+	test_when_finished "git -C destination checkout init.t" &&
+	test_must_fail git worktree remove destination
+'
+
+test_expect_success 'remove worktree with untracked file' '
+	: >destination/untracked &&
+	test_must_fail git worktree remove destination
+'
+
+test_expect_success 'force remove worktree with untracked file' '
+	git worktree remove --force destination &&
+	test_path_is_missing destination
+'
+
+test_expect_success 'remove missing worktree' '
+	git worktree add to-be-gone &&
+	test -d .git/worktrees/to-be-gone &&
+	mv to-be-gone gone &&
+	git worktree remove to-be-gone &&
+	test_path_is_missing .git/worktrees/to-be-gone
+'
+
+test_expect_success 'NOT remove missing-but-locked worktree' '
+	git worktree add gone-but-locked &&
+	git worktree lock gone-but-locked &&
+	test -d .git/worktrees/gone-but-locked &&
+	mv gone-but-locked really-gone-now &&
+	test_must_fail git worktree remove gone-but-locked &&
+	test_path_is_dir .git/worktrees/gone-but-locked
+'
+
 test_done
diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh
index c8bce8c..685ec45 100755
--- a/t/t2101-update-index-reupdate.sh
+++ b/t/t2101-update-index-reupdate.sh
@@ -8,19 +8,20 @@ test_description='git update-index --again test.
 
 . ./test-lib.sh
 
-cat > expected <<\EOF
-100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0	file1
-100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0	file2
-EOF
-test_expect_success 'update-index --add' \
-	'echo hello world >file1 &&
-	 echo goodbye people >file2 &&
-	 git update-index --add file1 file2 &&
-	 git ls-files -s >current &&
-	 cmp current expected'
+test_expect_success 'update-index --add' '
+	echo hello world >file1 &&
+	echo goodbye people >file2 &&
+	git update-index --add file1 file2 &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file1) 0	file1
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+'
 
-test_expect_success 'update-index --again' \
-	'rm -f file1 &&
+test_expect_success 'update-index --again' '
+	rm -f file1 &&
 	echo hello everybody >file2 &&
 	if git update-index --again
 	then
@@ -29,25 +30,23 @@ test_expect_success 'update-index --again' \
 	else
 		echo happy - failed as expected
 	fi &&
-	 git ls-files -s >current &&
-	 cmp current expected'
+	git ls-files -s >current &&
+	cmp current expected
+'
 
-cat > expected <<\EOF
-100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0	file2
-EOF
-test_expect_success 'update-index --remove --again' \
-	'git update-index --remove --again &&
-	 git ls-files -s >current &&
-	 cmp current expected'
+test_expect_success 'update-index --remove --again' '
+	git update-index --remove --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+'
 
 test_expect_success 'first commit' 'git commit -m initial'
 
-cat > expected <<\EOF
-100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0	dir1/file3
-100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0	file2
-EOF
-test_expect_success 'update-index again' \
-	'mkdir -p dir1 &&
+test_expect_success 'update-index again' '
+	mkdir -p dir1 &&
 	echo hello world >dir1/file3 &&
 	echo goodbye people >file2 &&
 	git update-index --add file2 dir1/file3 &&
@@ -55,30 +54,38 @@ test_expect_success 'update-index again' \
 	echo happy >dir1/file3 &&
 	git update-index --again &&
 	git ls-files -s >current &&
-	cmp current expected'
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+'
 
-cat > expected <<\EOF
-100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0	dir1/file3
-100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0	file2
-EOF
-test_expect_success 'update-index --update from subdir' \
-	'echo not so happy >file2 &&
+file2=$(git hash-object file2)
+test_expect_success 'update-index --update from subdir' '
+	echo not so happy >file2 &&
 	(cd dir1 &&
 	cat ../file2 >file3 &&
 	git update-index --again
 	) &&
 	git ls-files -s >current &&
-	cmp current expected'
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	test_cmp current expected
+'
 
-cat > expected <<\EOF
-100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0	dir1/file3
-100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0	file2
-EOF
-test_expect_success 'update-index --update with pathspec' \
-	'echo very happy >file2 &&
+test_expect_success 'update-index --update with pathspec' '
+	echo very happy >file2 &&
 	cat file2 >dir1/file3 &&
 	git update-index --again dir1/ &&
 	git ls-files -s >current &&
-	cmp current expected'
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	cmp current expected
+'
 
 test_done
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index 32ac6e0..1db7e6a 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -85,9 +85,9 @@ test_expect_success '--chmod=+x and chmod=-x in the same argument list' '
 	>B &&
 	git add A B &&
 	git update-index --chmod=+x A --chmod=-x B &&
-	cat >expect <<-\EOF &&
-	100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	A
-	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	B
+	cat >expect <<-EOF &&
+	100755 $EMPTY_BLOB 0	A
+	100644 $EMPTY_BLOB 0	B
 	EOF
 	git ls-files --stage A B >actual &&
 	test_cmp expect actual
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index cdc38fe..3563e77 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -525,20 +525,22 @@ test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
 		GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
 		export GIT_INDEX_FILE &&
 		mkdir "$GIT_WORK_TREE" &&
-		git read-tree -i -m $c7 &&
-		git update-index --ignore-missing --refresh &&
-		git merge-recursive $c0 -- $c7 $c3 &&
-		git ls-files -s >actual-files
-	) 2>actual-err &&
-	>expected-err &&
+		git read-tree -i -m $c7 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git update-index --ignore-missing --refresh 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git ls-files -s >actual-files 2>actual-err &&
+		test_must_be_empty actual-err
+	) &&
 	cat >expected-files <<-EOF &&
 	100644 $o3 0	b/c
 	100644 $o0 0	c
 	100644 $o0 0	d/e
 	100644 $o0 0	e
 	EOF
-	test_cmp expected-files actual-files &&
-	test_cmp expected-err actual-err
+	test_cmp expected-files actual-files
 '
 
 test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
@@ -548,20 +550,22 @@ test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
 		GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
 		export GIT_INDEX_FILE &&
 		mkdir "$GIT_WORK_TREE" &&
-		git read-tree -i -m $c3 &&
-		git update-index --ignore-missing --refresh &&
-		git merge-recursive $c0 -- $c3 $c7 &&
-		git ls-files -s >actual-files
-	) 2>actual-err &&
-	>expected-err &&
+		git read-tree -i -m $c3 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git update-index --ignore-missing --refresh 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git merge-recursive $c0 -- $c3 $c7 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git ls-files -s >actual-files 2>actual-err &&
+		test_must_be_empty actual-err
+	) &&
 	cat >expected-files <<-EOF &&
 	100644 $o3 0	b/c
 	100644 $o0 0	c
 	100644 $o0 0	d/e
 	100644 $o0 0	e
 	EOF
-	test_cmp expected-files actual-files &&
-	test_cmp expected-err actual-err
+	test_cmp expected-files actual-files
 '
 
 test_expect_success 'merge removes empty directories' '
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 163a14a..c1fc6ca 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -4,266 +4,431 @@ test_description='wildmatch tests'
 
 . ./test-lib.sh
 
-match() {
-    if [ $1 = 1 ]; then
-	test_expect_success "wildmatch:     match '$3' '$4'" "
-	    test-wildmatch wildmatch '$3' '$4'
-	"
-    else
-	test_expect_success "wildmatch:  no match '$3' '$4'" "
-	    ! test-wildmatch wildmatch '$3' '$4'
-	"
-    fi
+should_create_test_file() {
+	file=$1
+
+	case $file in
+	# `touch .` will succeed but obviously not do what we intend
+	# here.
+	".")
+		return 1
+		;;
+	# We cannot create a file with an empty filename.
+	"")
+		return 1
+		;;
+	# The tests that are testing that e.g. foo//bar is matched by
+	# foo/*/bar can't be tested on filesystems since there's no
+	# way we're getting a double slash.
+	*//*)
+		return 1
+		;;
+	# When testing the difference between foo/bar and foo/bar/ we
+	# can't test the latter.
+	*/)
+		return 1
+		;;
+	# On Windows, \ in paths is silently converted to /, which
+	# would result in the "touch" below working, but the test
+	# itself failing. See 6fd1106aa4 ("t3700: Skip a test with
+	# backslashes in pathspec", 2009-03-13) for prior art and
+	# details.
+	*\\*)
+		if ! test_have_prereq BSLASHPSPEC
+		then
+			return 1
+		fi
+		# NOTE: The ;;& bash extension is not portable, so
+		# this test needs to be at the end of the pattern
+		# list.
+		#
+		# If we want to add more conditional returns we either
+		# need a new case statement, or turn this whole thing
+		# into a series of "if" tests.
+		;;
+	esac
+
+
+	# On Windows proper (i.e. not Cygwin) many file names which
+	# under Cygwin would be emulated don't work.
+	if test_have_prereq MINGW
+	then
+		case $file in
+		" ")
+			# Files called " " are forbidden on Windows
+			return 1
+			;;
+		*\<*|*\>*|*:*|*\"*|*\|*|*\?*|*\**)
+			# Files with various special characters aren't
+			# allowed on Windows. Sourced from
+			# https://stackoverflow.com/a/31976060
+			return 1
+			;;
+		esac
+	fi
+
+	return 0
 }
 
-imatch() {
-    if [ $1 = 1 ]; then
-	test_expect_success "iwildmatch:    match '$2' '$3'" "
-	    test-wildmatch iwildmatch '$2' '$3'
-	"
-    else
-	test_expect_success "iwildmatch: no match '$2' '$3'" "
-	    ! test-wildmatch iwildmatch '$2' '$3'
-	"
-    fi
+match_with_function() {
+	text=$1
+	pattern=$2
+	match_expect=$3
+	match_function=$4
+
+	if test "$match_expect" = 1
+	then
+		test_expect_success "$match_function: match '$text' '$pattern'" "
+			test-wildmatch $match_function '$text' '$pattern'
+		"
+	elif test "$match_expect" = 0
+	then
+		test_expect_success "$match_function: no match '$text' '$pattern'" "
+			test_must_fail test-wildmatch $match_function '$text' '$pattern'
+		"
+	else
+		test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
+	fi
+
+}
+
+match_with_ls_files() {
+	text=$1
+	pattern=$2
+	match_expect=$3
+	match_function=$4
+	ls_files_args=$5
+
+	match_stdout_stderr_cmp="
+		tr -d '\0' <actual.raw >actual &&
+		>expect.err &&
+		test_cmp expect.err actual.err &&
+		test_cmp expect actual"
+
+	if test "$match_expect" = 'E'
+	then
+		if test -e .git/created_test_file
+		then
+			test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match dies on '$pattern' '$text'" "
+				printf '%s' '$text' >expect &&
+				test_must_fail git$ls_files_args ls-files -z -- '$pattern'
+			"
+		else
+			test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
+		fi
+	elif test "$match_expect" = 1
+	then
+		if test -e .git/created_test_file
+		then
+			test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match '$pattern' '$text'" "
+				printf '%s' '$text' >expect &&
+				git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
+				$match_stdout_stderr_cmp
+			"
+		else
+			test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
+		fi
+	elif test "$match_expect" = 0
+	then
+		if test -e .git/created_test_file
+		then
+			test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match '$pattern' '$text'" "
+				>expect &&
+				git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
+				$match_stdout_stderr_cmp
+			"
+		else
+			test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
+		fi
+	else
+		test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
+	fi
 }
 
-pathmatch() {
-    if [ $1 = 1 ]; then
-	test_expect_success "pathmatch:     match '$2' '$3'" "
-	    test-wildmatch pathmatch '$2' '$3'
-	"
-    else
-	test_expect_success "pathmatch:  no match '$2' '$3'" "
-	    ! test-wildmatch pathmatch '$2' '$3'
-	"
-    fi
+match() {
+	if test "$#" = 6
+	then
+		# When test-wildmatch and git ls-files produce the same
+		# result.
+		match_glob=$1
+		match_file_glob=$match_glob
+		match_iglob=$2
+		match_file_iglob=$match_iglob
+		match_pathmatch=$3
+		match_file_pathmatch=$match_pathmatch
+		match_pathmatchi=$4
+		match_file_pathmatchi=$match_pathmatchi
+		text=$5
+		pattern=$6
+	elif test "$#" = 10
+	then
+		match_glob=$1
+		match_iglob=$2
+		match_pathmatch=$3
+		match_pathmatchi=$4
+		match_file_glob=$5
+		match_file_iglob=$6
+		match_file_pathmatch=$7
+		match_file_pathmatchi=$8
+		text=$9
+		pattern=${10}
+	fi
+
+	test_expect_success EXPENSIVE_ON_WINDOWS 'cleanup after previous file test' '
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	'
+
+	printf '%s' "$text" >.git/expected_test_file
+
+	test_expect_success EXPENSIVE_ON_WINDOWS "setup match file test for $text" '
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	'
+
+	# $1: Case sensitive glob match: test-wildmatch & ls-files
+	match_with_function "$text" "$pattern" $match_glob "wildmatch"
+	match_with_ls_files "$text" "$pattern" $match_file_glob "wildmatch" " --glob-pathspecs"
+
+	# $2: Case insensitive glob match: test-wildmatch & ls-files
+	match_with_function "$text" "$pattern" $match_iglob "iwildmatch"
+	match_with_ls_files "$text" "$pattern" $match_file_iglob "iwildmatch" " --glob-pathspecs --icase-pathspecs"
+
+	# $3: Case sensitive path match: test-wildmatch & ls-files
+	match_with_function "$text" "$pattern" $match_pathmatch "pathmatch"
+	match_with_ls_files "$text" "$pattern" $match_file_pathmatch "pathmatch" ""
+
+	# $4: Case insensitive path match: test-wildmatch & ls-files
+	match_with_function "$text" "$pattern" $match_pathmatchi "ipathmatch"
+	match_with_ls_files "$text" "$pattern" $match_file_pathmatchi "ipathmatch" " --icase-pathspecs"
 }
 
-# Basic wildmat features
-match 1 1 foo foo
-match 0 0 foo bar
-match 1 1 '' ""
-match 1 1 foo '???'
-match 0 0 foo '??'
-match 1 1 foo '*'
-match 1 1 foo 'f*'
-match 0 0 foo '*f'
-match 1 1 foo '*foo*'
-match 1 1 foobar '*ob*a*r*'
-match 1 1 aaaaaaabababab '*ab'
-match 1 1 'foo*' 'foo\*'
-match 0 0 foobar 'foo\*bar'
-match 1 1 'f\oo' 'f\\oo'
-match 1 1 ball '*[al]?'
-match 0 0 ten '[ten]'
-match 0 1 ten '**[!te]'
-match 0 0 ten '**[!ten]'
-match 1 1 ten 't[a-g]n'
-match 0 0 ten 't[!a-g]n'
-match 1 1 ton 't[!a-g]n'
-match 1 1 ton 't[^a-g]n'
-match 1 x 'a]b' 'a[]]b'
-match 1 x a-b 'a[]-]b'
-match 1 x 'a]b' 'a[]-]b'
-match 0 x aab 'a[]-]b'
-match 1 x aab 'a[]a-]b'
-match 1 1 ']' ']'
+# Basic wildmatch features
+match 1 1 1 1 foo foo
+match 0 0 0 0 foo bar
+match 1 1 1 1 '' ""
+match 1 1 1 1 foo '???'
+match 0 0 0 0 foo '??'
+match 1 1 1 1 foo '*'
+match 1 1 1 1 foo 'f*'
+match 0 0 0 0 foo '*f'
+match 1 1 1 1 foo '*foo*'
+match 1 1 1 1 foobar '*ob*a*r*'
+match 1 1 1 1 aaaaaaabababab '*ab'
+match 1 1 1 1 'foo*' 'foo\*'
+match 0 0 0 0 foobar 'foo\*bar'
+match 1 1 1 1 'f\oo' 'f\\oo'
+match 1 1 1 1 ball '*[al]?'
+match 0 0 0 0 ten '[ten]'
+match 0 0 1 1 ten '**[!te]'
+match 0 0 0 0 ten '**[!ten]'
+match 1 1 1 1 ten 't[a-g]n'
+match 0 0 0 0 ten 't[!a-g]n'
+match 1 1 1 1 ton 't[!a-g]n'
+match 1 1 1 1 ton 't[^a-g]n'
+match 1 1 1 1 'a]b' 'a[]]b'
+match 1 1 1 1 a-b 'a[]-]b'
+match 1 1 1 1 'a]b' 'a[]-]b'
+match 0 0 0 0 aab 'a[]-]b'
+match 1 1 1 1 aab 'a[]a-]b'
+match 1 1 1 1 ']' ']'
 
 # Extended slash-matching features
-match 0 0 'foo/baz/bar' 'foo*bar'
-match 0 0 'foo/baz/bar' 'foo**bar'
-match 0 1 'foobazbar' 'foo**bar'
-match 1 1 'foo/baz/bar' 'foo/**/bar'
-match 1 0 'foo/baz/bar' 'foo/**/**/bar'
-match 1 0 'foo/b/a/z/bar' 'foo/**/bar'
-match 1 0 'foo/b/a/z/bar' 'foo/**/**/bar'
-match 1 0 'foo/bar' 'foo/**/bar'
-match 1 0 'foo/bar' 'foo/**/**/bar'
-match 0 0 'foo/bar' 'foo?bar'
-match 0 0 'foo/bar' 'foo[/]bar'
-match 0 0 'foo/bar' 'foo[^a-z]bar'
-match 0 0 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-match 1 1 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-match 1 0 'foo' '**/foo'
-match 1 x 'XXX/foo' '**/foo'
-match 1 0 'bar/baz/foo' '**/foo'
-match 0 0 'bar/baz/foo' '*/foo'
-match 0 0 'foo/bar/baz' '**/bar*'
-match 1 0 'deep/foo/bar/baz' '**/bar/*'
-match 0 0 'deep/foo/bar/baz/' '**/bar/*'
-match 1 0 'deep/foo/bar/baz/' '**/bar/**'
-match 0 0 'deep/foo/bar' '**/bar/*'
-match 1 0 'deep/foo/bar/' '**/bar/**'
-match 0 0 'foo/bar/baz' '**/bar**'
-match 1 0 'foo/bar/baz/x' '*/bar/**'
-match 0 0 'deep/foo/bar/baz/x' '*/bar/**'
-match 1 0 'deep/foo/bar/baz/x' '**/bar/*/*'
+match 0 0 1 1 'foo/baz/bar' 'foo*bar'
+match 0 0 1 1 'foo/baz/bar' 'foo**bar'
+match 0 0 1 1 'foobazbar' 'foo**bar'
+match 1 1 1 1 'foo/baz/bar' 'foo/**/bar'
+match 1 1 0 0 'foo/baz/bar' 'foo/**/**/bar'
+match 1 1 1 1 'foo/b/a/z/bar' 'foo/**/bar'
+match 1 1 1 1 'foo/b/a/z/bar' 'foo/**/**/bar'
+match 1 1 0 0 'foo/bar' 'foo/**/bar'
+match 1 1 0 0 'foo/bar' 'foo/**/**/bar'
+match 0 0 1 1 'foo/bar' 'foo?bar'
+match 0 0 1 1 'foo/bar' 'foo[/]bar'
+match 0 0 1 1 'foo/bar' 'foo[^a-z]bar'
+match 0 0 1 1 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+match 1 1 1 1 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+match 1 1 0 0 'foo' '**/foo'
+match 1 1 1 1 'XXX/foo' '**/foo'
+match 1 1 1 1 'bar/baz/foo' '**/foo'
+match 0 0 1 1 'bar/baz/foo' '*/foo'
+match 0 0 1 1 'foo/bar/baz' '**/bar*'
+match 1 1 1 1 'deep/foo/bar/baz' '**/bar/*'
+match 0 0 1 1 'deep/foo/bar/baz/' '**/bar/*'
+match 1 1 1 1 'deep/foo/bar/baz/' '**/bar/**'
+match 0 0 0 0 'deep/foo/bar' '**/bar/*'
+match 1 1 1 1 'deep/foo/bar/' '**/bar/**'
+match 0 0 1 1 'foo/bar/baz' '**/bar**'
+match 1 1 1 1 'foo/bar/baz/x' '*/bar/**'
+match 0 0 1 1 'deep/foo/bar/baz/x' '*/bar/**'
+match 1 1 1 1 'deep/foo/bar/baz/x' '**/bar/*/*'
 
 # Various additional tests
-match 0 0 'acrt' 'a[c-c]st'
-match 1 1 'acrt' 'a[c-c]rt'
-match 0 0 ']' '[!]-]'
-match 1 x 'a' '[!]-]'
-match 0 0 '' '\'
-match 0 x '\' '\'
-match 0 x 'XXX/\' '*/\'
-match 1 x 'XXX/\' '*/\\'
-match 1 1 'foo' 'foo'
-match 1 1 '@foo' '@foo'
-match 0 0 'foo' '@foo'
-match 1 1 '[ab]' '\[ab]'
-match 1 1 '[ab]' '[[]ab]'
-match 1 x '[ab]' '[[:]ab]'
-match 0 x '[ab]' '[[::]ab]'
-match 1 x '[ab]' '[[:digit]ab]'
-match 1 x '[ab]' '[\[:]ab]'
-match 1 1 '?a?b' '\??\?b'
-match 1 1 'abc' '\a\b\c'
-match 0 0 'foo' ''
-match 1 0 'foo/bar/baz/to' '**/t[o]'
+match 0 0 0 0 'acrt' 'a[c-c]st'
+match 1 1 1 1 'acrt' 'a[c-c]rt'
+match 0 0 0 0 ']' '[!]-]'
+match 1 1 1 1 'a' '[!]-]'
+match 0 0 0 0 '' '\'
+match 0 0 0 0 \
+      1 1 1 1 '\' '\'
+match 0 0 0 0 'XXX/\' '*/\'
+match 1 1 1 1 'XXX/\' '*/\\'
+match 1 1 1 1 'foo' 'foo'
+match 1 1 1 1 '@foo' '@foo'
+match 0 0 0 0 'foo' '@foo'
+match 1 1 1 1 '[ab]' '\[ab]'
+match 1 1 1 1 '[ab]' '[[]ab]'
+match 1 1 1 1 '[ab]' '[[:]ab]'
+match 0 0 0 0 '[ab]' '[[::]ab]'
+match 1 1 1 1 '[ab]' '[[:digit]ab]'
+match 1 1 1 1 '[ab]' '[\[:]ab]'
+match 1 1 1 1 '?a?b' '\??\?b'
+match 1 1 1 1 'abc' '\a\b\c'
+match 0 0 0 0 \
+      E E E E 'foo' ''
+match 1 1 1 1 'foo/bar/baz/to' '**/t[o]'
 
 # Character class tests
-match 1 x 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-match 0 x 'a' '[[:digit:][:upper:][:space:]]'
-match 1 x 'A' '[[:digit:][:upper:][:space:]]'
-match 1 x '1' '[[:digit:][:upper:][:space:]]'
-match 0 x '1' '[[:digit:][:upper:][:spaci:]]'
-match 1 x ' ' '[[:digit:][:upper:][:space:]]'
-match 0 x '.' '[[:digit:][:upper:][:space:]]'
-match 1 x '.' '[[:digit:][:punct:][:space:]]'
-match 1 x '5' '[[:xdigit:]]'
-match 1 x 'f' '[[:xdigit:]]'
-match 1 x 'D' '[[:xdigit:]]'
-match 1 x '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-match 1 x '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-match 1 x '5' '[a-c[:digit:]x-z]'
-match 1 x 'b' '[a-c[:digit:]x-z]'
-match 1 x 'y' '[a-c[:digit:]x-z]'
-match 0 x 'q' '[a-c[:digit:]x-z]'
-
-# Additional tests, including some malformed wildmats
-match 1 x ']' '[\\-^]'
-match 0 0 '[' '[\\-^]'
-match 1 x '-' '[\-_]'
-match 1 x ']' '[\]]'
-match 0 0 '\]' '[\]]'
-match 0 0 '\' '[\]]'
-match 0 0 'ab' 'a[]b'
-match 0 x 'a[]b' 'a[]b'
-match 0 x 'ab[' 'ab['
-match 0 0 'ab' '[!'
-match 0 0 'ab' '[-'
-match 1 1 '-' '[-]'
-match 0 0 '-' '[a-'
-match 0 0 '-' '[!a-'
-match 1 x '-' '[--A]'
-match 1 x '5' '[--A]'
-match 1 1 ' ' '[ --]'
-match 1 1 '$' '[ --]'
-match 1 1 '-' '[ --]'
-match 0 0 '0' '[ --]'
-match 1 x '-' '[---]'
-match 1 x '-' '[------]'
-match 0 0 'j' '[a-e-n]'
-match 1 x '-' '[a-e-n]'
-match 1 x 'a' '[!------]'
-match 0 0 '[' '[]-a]'
-match 1 x '^' '[]-a]'
-match 0 0 '^' '[!]-a]'
-match 1 x '[' '[!]-a]'
-match 1 1 '^' '[a^bc]'
-match 1 x '-b]' '[a-]b]'
-match 0 0 '\' '[\]'
-match 1 1 '\' '[\\]'
-match 0 0 '\' '[!\\]'
-match 1 1 'G' '[A-\\]'
-match 0 0 'aaabbb' 'b*a'
-match 0 0 'aabcaa' '*ba*'
-match 1 1 ',' '[,]'
-match 1 1 ',' '[\\,]'
-match 1 1 '\' '[\\,]'
-match 1 1 '-' '[,-.]'
-match 0 0 '+' '[,-.]'
-match 0 0 '-.]' '[,-.]'
-match 1 1 '2' '[\1-\3]'
-match 1 1 '3' '[\1-\3]'
-match 0 0 '4' '[\1-\3]'
-match 1 1 '\' '[[-\]]'
-match 1 1 '[' '[[-\]]'
-match 1 1 ']' '[[-\]]'
-match 0 0 '-' '[[-\]]'
+match 1 1 1 1 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+match 0 1 0 1 'a' '[[:digit:][:upper:][:space:]]'
+match 1 1 1 1 'A' '[[:digit:][:upper:][:space:]]'
+match 1 1 1 1 '1' '[[:digit:][:upper:][:space:]]'
+match 0 0 0 0 '1' '[[:digit:][:upper:][:spaci:]]'
+match 1 1 1 1 ' ' '[[:digit:][:upper:][:space:]]'
+match 0 0 0 0 '.' '[[:digit:][:upper:][:space:]]'
+match 1 1 1 1 '.' '[[:digit:][:punct:][:space:]]'
+match 1 1 1 1 '5' '[[:xdigit:]]'
+match 1 1 1 1 'f' '[[:xdigit:]]'
+match 1 1 1 1 'D' '[[:xdigit:]]'
+match 1 1 1 1 '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+match 1 1 1 1 '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+match 1 1 1 1 '5' '[a-c[:digit:]x-z]'
+match 1 1 1 1 'b' '[a-c[:digit:]x-z]'
+match 1 1 1 1 'y' '[a-c[:digit:]x-z]'
+match 0 0 0 0 'q' '[a-c[:digit:]x-z]'
 
-# Test recursion and the abort code (use "wildtest -i" to see iteration counts)
-match 1 1 '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-match 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-match 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-match 1 1 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-match 0 0 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-match 1 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
-match 0 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
-match 0 x foo '*/*/*'
-match 0 x foo/bar '*/*/*'
-match 1 x foo/bba/arr '*/*/*'
-match 0 x foo/bb/aa/rr '*/*/*'
-match 1 x foo/bb/aa/rr '**/**/**'
-match 1 x abcXdefXghi '*X*i'
-match 0 x ab/cXd/efXg/hi '*X*i'
-match 1 x ab/cXd/efXg/hi '*/*X*/*/*i'
-match 1 x ab/cXd/efXg/hi '**/*X*/**/*i'
+# Additional tests, including some malformed wildmatch patterns
+match 1 1 1 1 ']' '[\\-^]'
+match 0 0 0 0 '[' '[\\-^]'
+match 1 1 1 1 '-' '[\-_]'
+match 1 1 1 1 ']' '[\]]'
+match 0 0 0 0 '\]' '[\]]'
+match 0 0 0 0 '\' '[\]]'
+match 0 0 0 0 'ab' 'a[]b'
+match 0 0 0 0 \
+      1 1 1 1 'a[]b' 'a[]b'
+match 0 0 0 0 \
+      1 1 1 1 'ab[' 'ab['
+match 0 0 0 0 'ab' '[!'
+match 0 0 0 0 'ab' '[-'
+match 1 1 1 1 '-' '[-]'
+match 0 0 0 0 '-' '[a-'
+match 0 0 0 0 '-' '[!a-'
+match 1 1 1 1 '-' '[--A]'
+match 1 1 1 1 '5' '[--A]'
+match 1 1 1 1 ' ' '[ --]'
+match 1 1 1 1 '$' '[ --]'
+match 1 1 1 1 '-' '[ --]'
+match 0 0 0 0 '0' '[ --]'
+match 1 1 1 1 '-' '[---]'
+match 1 1 1 1 '-' '[------]'
+match 0 0 0 0 'j' '[a-e-n]'
+match 1 1 1 1 '-' '[a-e-n]'
+match 1 1 1 1 'a' '[!------]'
+match 0 0 0 0 '[' '[]-a]'
+match 1 1 1 1 '^' '[]-a]'
+match 0 0 0 0 '^' '[!]-a]'
+match 1 1 1 1 '[' '[!]-a]'
+match 1 1 1 1 '^' '[a^bc]'
+match 1 1 1 1 '-b]' '[a-]b]'
+match 0 0 0 0 '\' '[\]'
+match 1 1 1 1 '\' '[\\]'
+match 0 0 0 0 '\' '[!\\]'
+match 1 1 1 1 'G' '[A-\\]'
+match 0 0 0 0 'aaabbb' 'b*a'
+match 0 0 0 0 'aabcaa' '*ba*'
+match 1 1 1 1 ',' '[,]'
+match 1 1 1 1 ',' '[\\,]'
+match 1 1 1 1 '\' '[\\,]'
+match 1 1 1 1 '-' '[,-.]'
+match 0 0 0 0 '+' '[,-.]'
+match 0 0 0 0 '-.]' '[,-.]'
+match 1 1 1 1 '2' '[\1-\3]'
+match 1 1 1 1 '3' '[\1-\3]'
+match 0 0 0 0 '4' '[\1-\3]'
+match 1 1 1 1 '\' '[[-\]]'
+match 1 1 1 1 '[' '[[-\]]'
+match 1 1 1 1 ']' '[[-\]]'
+match 0 0 0 0 '-' '[[-\]]'
 
-pathmatch 1 foo foo
-pathmatch 0 foo fo
-pathmatch 1 foo/bar foo/bar
-pathmatch 1 foo/bar 'foo/*'
-pathmatch 1 foo/bba/arr 'foo/*'
-pathmatch 1 foo/bba/arr 'foo/**'
-pathmatch 1 foo/bba/arr 'foo*'
-pathmatch 1 foo/bba/arr 'foo**'
-pathmatch 1 foo/bba/arr 'foo/*arr'
-pathmatch 1 foo/bba/arr 'foo/**arr'
-pathmatch 0 foo/bba/arr 'foo/*z'
-pathmatch 0 foo/bba/arr 'foo/**z'
-pathmatch 1 foo/bar 'foo?bar'
-pathmatch 1 foo/bar 'foo[/]bar'
-pathmatch 1 foo/bar 'foo[^a-z]bar'
-pathmatch 0 foo '*/*/*'
-pathmatch 0 foo/bar '*/*/*'
-pathmatch 1 foo/bba/arr '*/*/*'
-pathmatch 1 foo/bb/aa/rr '*/*/*'
-pathmatch 1 abcXdefXghi '*X*i'
-pathmatch 1 ab/cXd/efXg/hi '*/*X*/*/*i'
-pathmatch 1 ab/cXd/efXg/hi '*Xg*i'
+# Test recursion
+match 1 1 1 1 '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+match 0 0 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+match 0 0 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+match 1 1 1 1 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+match 0 0 0 0 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+match 1 1 1 1 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+match 0 0 0 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+match 0 0 0 0 foo '*/*/*'
+match 0 0 0 0 foo/bar '*/*/*'
+match 1 1 1 1 foo/bba/arr '*/*/*'
+match 0 0 1 1 foo/bb/aa/rr '*/*/*'
+match 1 1 1 1 foo/bb/aa/rr '**/**/**'
+match 1 1 1 1 abcXdefXghi '*X*i'
+match 0 0 1 1 ab/cXd/efXg/hi '*X*i'
+match 1 1 1 1 ab/cXd/efXg/hi '*/*X*/*/*i'
+match 1 1 1 1 ab/cXd/efXg/hi '**/*X*/**/*i'
 
-# Case-sensitivity features
-match 0 x 'a' '[A-Z]'
-match 1 x 'A' '[A-Z]'
-match 0 x 'A' '[a-z]'
-match 1 x 'a' '[a-z]'
-match 0 x 'a' '[[:upper:]]'
-match 1 x 'A' '[[:upper:]]'
-match 0 x 'A' '[[:lower:]]'
-match 1 x 'a' '[[:lower:]]'
-match 0 x 'A' '[B-Za]'
-match 1 x 'a' '[B-Za]'
-match 0 x 'A' '[B-a]'
-match 1 x 'a' '[B-a]'
-match 0 x 'z' '[Z-y]'
-match 1 x 'Z' '[Z-y]'
+# Extra pathmatch tests
+match 0 0 0 0 foo fo
+match 1 1 1 1 foo/bar foo/bar
+match 1 1 1 1 foo/bar 'foo/*'
+match 0 0 1 1 foo/bba/arr 'foo/*'
+match 1 1 1 1 foo/bba/arr 'foo/**'
+match 0 0 1 1 foo/bba/arr 'foo*'
+match 0 0 1 1 \
+      1 1 1 1 foo/bba/arr 'foo**'
+match 0 0 1 1 foo/bba/arr 'foo/*arr'
+match 0 0 1 1 foo/bba/arr 'foo/**arr'
+match 0 0 0 0 foo/bba/arr 'foo/*z'
+match 0 0 0 0 foo/bba/arr 'foo/**z'
+match 0 0 1 1 foo/bar 'foo?bar'
+match 0 0 1 1 foo/bar 'foo[/]bar'
+match 0 0 1 1 foo/bar 'foo[^a-z]bar'
+match 0 0 1 1 ab/cXd/efXg/hi '*Xg*i'
 
-imatch 1 'a' '[A-Z]'
-imatch 1 'A' '[A-Z]'
-imatch 1 'A' '[a-z]'
-imatch 1 'a' '[a-z]'
-imatch 1 'a' '[[:upper:]]'
-imatch 1 'A' '[[:upper:]]'
-imatch 1 'A' '[[:lower:]]'
-imatch 1 'a' '[[:lower:]]'
-imatch 1 'A' '[B-Za]'
-imatch 1 'a' '[B-Za]'
-imatch 1 'A' '[B-a]'
-imatch 1 'a' '[B-a]'
-imatch 1 'z' '[Z-y]'
-imatch 1 'Z' '[Z-y]'
+# Extra case-sensitivity tests
+match 0 1 0 1 'a' '[A-Z]'
+match 1 1 1 1 'A' '[A-Z]'
+match 0 1 0 1 'A' '[a-z]'
+match 1 1 1 1 'a' '[a-z]'
+match 0 1 0 1 'a' '[[:upper:]]'
+match 1 1 1 1 'A' '[[:upper:]]'
+match 0 1 0 1 'A' '[[:lower:]]'
+match 1 1 1 1 'a' '[[:lower:]]'
+match 0 1 0 1 'A' '[B-Za]'
+match 1 1 1 1 'a' '[B-Za]'
+match 0 1 0 1 'A' '[B-a]'
+match 1 1 1 1 'a' '[B-a]'
+match 0 1 0 1 'z' '[Z-y]'
+match 1 1 1 1 'Z' '[Z-y]'
 
 test_done
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 503a88d..6c0b7ea 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -528,7 +528,7 @@ test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '
 	git branch -c -f o/q o/p
 '
 
-test_expect_success 'git branch -c qq rr/qq should fail when r exists' '
+test_expect_success 'git branch -c qq rr/qq should fail when rr exists' '
 	git branch qq &&
 	git branch rr &&
 	test_must_fail git branch -c qq rr/qq
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 8ac58d5..72d9564 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -277,4 +277,38 @@ EOF
 	test_cmp From_.msg out
 '
 
+test_expect_success 'rebase--am.sh and --show-current-patch' '
+	test_create_repo conflict-apply &&
+	(
+		cd conflict-apply &&
+		test_commit init &&
+		echo one >>init.t &&
+		git commit -a -m one &&
+		echo two >>init.t &&
+		git commit -a -m two &&
+		git tag two &&
+		test_must_fail git rebase --onto init HEAD^ &&
+		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+		grep "show.*$(git rev-parse two)" stderr
+	)
+'
+
+test_expect_success 'rebase--merge.sh and --show-current-patch' '
+	test_create_repo conflict-merge &&
+	(
+		cd conflict-merge &&
+		test_commit init &&
+		echo one >>init.t &&
+		git commit -a -m one &&
+		echo two >>init.t &&
+		git commit -a -m two &&
+		git tag two &&
+		test_must_fail git rebase --merge --onto init HEAD^ &&
+		git rebase --show-current-patch >actual.patch &&
+		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+		grep "show.*REBASE_HEAD" stderr &&
+		test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
+	)
+'
+
 test_done
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index ef2887b..c59d038 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -225,6 +225,14 @@ test_expect_success 'stop on conflicting pick' '
 	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
 '
 
+test_expect_success 'show conflicted patch' '
+	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+	grep "show.*REBASE_HEAD" stderr &&
+	# the original stopped-sha1 is abbreviated
+	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
+	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
+'
+
 test_expect_success 'abort' '
 	git rebase --abort &&
 	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
@@ -919,10 +927,8 @@ test_expect_success 'rebase --exec works without -i ' '
 test_expect_success 'rebase -i --exec without <CMD>' '
 	git reset --hard execute &&
 	set_fake_editor &&
-	test_must_fail git rebase -i --exec 2>tmp &&
-	sed -e "1d" tmp >actual &&
-	test_must_fail git rebase -h >expected &&
-	test_cmp expected actual &&
+	test_must_fail git rebase -i --exec 2>actual &&
+	test_i18ngrep "requires a value" actual &&
 	git checkout master
 '
 
diff --git a/t/t3405-rebase-malformed.sh b/t/t3405-rebase-malformed.sh
index ff8c360..cb7c6de 100755
--- a/t/t3405-rebase-malformed.sh
+++ b/t/t3405-rebase-malformed.sh
@@ -3,6 +3,7 @@
 test_description='rebase should handle arbitrary git message'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
 
 cat >F <<\EOF
 This is an example of a commit log message
@@ -25,6 +26,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m "Initial commit" &&
 	git branch diff-in-message &&
+	git branch empty-message-merge &&
 
 	git checkout -b multi-line-subject &&
 	cat F >file2 &&
@@ -45,6 +47,11 @@ test_expect_success setup '
 
 	git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
 
+	git checkout empty-message-merge &&
+	echo file3 >file3 &&
+	git add file3 &&
+	git commit --allow-empty-message -m "" &&
+
 	git checkout master &&
 
 	echo One >file1 &&
@@ -69,4 +76,20 @@ test_expect_success 'rebase commit with diff in message' '
 	test_cmp G G0
 '
 
+test_expect_success 'rebase -m commit with empty message' '
+	test_must_fail git rebase -m master empty-message-merge &&
+	git rebase --abort &&
+	git rebase -m --allow-empty-message master empty-message-merge
+'
+
+test_expect_success 'rebase -i commit with empty message' '
+	git checkout diff-in-message &&
+	set_fake_editor &&
+	test_must_fail env FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \
+		git rebase -i HEAD^ &&
+	git rebase --abort &&
+	FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \
+		git rebase -i --allow-empty-message HEAD^
+'
+
 test_done
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index 6b84e60..e7292f5 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -24,8 +24,23 @@ But otherwise with a sane description." &&
 	>elif &&
 	git add elif &&
 	test_tick &&
-	git commit -m second
+	git commit -m second &&
 
+	git checkout -b side2 &&
+	>afile &&
+	git add afile &&
+	test_tick &&
+	git commit -m third &&
+	echo hello >afile &&
+	test_tick &&
+	git commit -a -m fourth &&
+	git checkout -b side-merge &&
+	git reset --hard HEAD^^ &&
+	git merge --no-ff -m "A merge commit log message that has a long
+summary that spills over multiple lines.
+
+But otherwise with a sane description." side2 &&
+	git branch side-merge-original
 '
 
 test_expect_success rebase '
@@ -37,5 +52,14 @@ test_expect_success rebase '
 	test_cmp expect actual
 
 '
+test_expect_success rebasep '
+
+	git checkout side-merge &&
+	git rebase -p side &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
+	test_cmp expect actual
+
+'
 
 test_done
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 4f2a263..0d89f6d 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -150,7 +150,10 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
 	test_tick &&
 	git commit -m renamed &&
 	echo modified >renamed &&
-	git cherry-pick refs/heads/unrelated
+	test_must_fail git cherry-pick refs/heads/unrelated >out &&
+	test_i18ngrep "Refusing to lose dirty file at renamed" out &&
+	test $(git rev-parse :0:renamed) = $(git rev-parse HEAD^:to-rename.t) &&
+	grep -q "^modified$" renamed
 '
 
 test_done
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 058698d..b170fb0 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -10,6 +10,19 @@ then
 	test_done
 fi
 
+diff_cmp () {
+	for x
+	do
+		sed  -e '/^index/s/[0-9a-f]*[1-9a-f][0-9a-f]*\.\./1234567../' \
+		     -e '/^index/s/\.\.[0-9a-f]*[1-9a-f][0-9a-f]*/..9abcdef/' \
+		     -e '/^index/s/ 00*\.\./ 0000000../' \
+		     -e '/^index/s/\.\.00*$/..0000000/' \
+		     -e '/^index/s/\.\.00* /..0000000 /' \
+		     "$x" >"$x.filtered"
+	done
+	test_cmp "$1.filtered" "$2.filtered"
+}
+
 test_expect_success 'setup (initial)' '
 	echo content >file &&
 	git add file &&
@@ -22,20 +35,20 @@ test_expect_success 'status works (initial)' '
 '
 
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-new file mode 100644
-index 0000000..d95f3ad
---- /dev/null
-+++ b/file
-@@ -0,0 +1 @@
-+content
-EOF
+	cat >expected <<-\EOF
+	new file mode 100644
+	index 0000000..d95f3ad
+	--- /dev/null
+	+++ b/file
+	@@ -0,0 +1 @@
+	+content
+	EOF
 '
 
 test_expect_success 'diff works (initial)' '
 	(echo d; echo 1) | git add -i >output &&
 	sed -ne "/new file/,/content/p" <output >diff &&
-	test_cmp expected diff
+	diff_cmp expected diff
 '
 test_expect_success 'revert works (initial)' '
 	git add file &&
@@ -59,20 +72,20 @@ test_expect_success 'status works (commit)' '
 '
 
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-index 180b47c..b6f2c08 100644
---- a/file
-+++ b/file
-@@ -1 +1,2 @@
- baseline
-+content
-EOF
+	cat >expected <<-\EOF
+	index 180b47c..b6f2c08 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1,2 @@
+	 baseline
+	+content
+	EOF
 '
 
 test_expect_success 'diff works (commit)' '
 	(echo d; echo 1) | git add -i >output &&
 	sed -ne "/^index/,/content/p" <output >diff &&
-	test_cmp expected diff
+	diff_cmp expected diff
 '
 test_expect_success 'revert works (commit)' '
 	git add file &&
@@ -83,39 +96,32 @@ test_expect_success 'revert works (commit)' '
 
 
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-EOF
-'
-
-test_expect_success 'setup fake editor' '
-	>fake_editor.sh &&
-	chmod a+x fake_editor.sh &&
-	test_set_editor "$(pwd)/fake_editor.sh"
+	cat >expected <<-\EOF
+	EOF
 '
 
 test_expect_success 'dummy edit works' '
+	test_set_editor : &&
 	(echo e; echo a) | git add -p &&
 	git diff > diff &&
-	test_cmp expected diff
+	diff_cmp expected diff
 '
 
 test_expect_success 'setup patch' '
-cat >patch <<EOF
-@@ -1,1 +1,4 @@
- this
-+patch
--does not
- apply
-EOF
+	cat >patch <<-\EOF
+	@@ -1,1 +1,4 @@
+	 this
+	+patch
+	-does not
+	 apply
+	EOF
 '
 
 test_expect_success 'setup fake editor' '
-	echo "#!$SHELL_PATH" >fake_editor.sh &&
-	cat >>fake_editor.sh <<\EOF &&
-mv -f "$1" oldpatch &&
-mv -f patch "$1"
-EOF
-	chmod a+x fake_editor.sh &&
+	write_script "fake_editor.sh" <<-\EOF &&
+	mv -f "$1" oldpatch &&
+	mv -f patch "$1"
+	EOF
 	test_set_editor "$(pwd)/fake_editor.sh"
 '
 
@@ -126,10 +132,10 @@ test_expect_success 'bad edit rejected' '
 '
 
 test_expect_success 'setup patch' '
-cat >patch <<EOF
-this patch
-is garbage
-EOF
+	cat >patch <<-\EOF
+	this patch
+	is garbage
+	EOF
 '
 
 test_expect_success 'garbage edit rejected' '
@@ -139,34 +145,34 @@ test_expect_success 'garbage edit rejected' '
 '
 
 test_expect_success 'setup patch' '
-cat >patch <<EOF
-@@ -1,0 +1,0 @@
- baseline
-+content
-+newcontent
-+lines
-EOF
+	cat >patch <<-\EOF
+	@@ -1,0 +1,0 @@
+	 baseline
+	+content
+	+newcontent
+	+lines
+	EOF
 '
 
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-diff --git a/file b/file
-index b5dd6c9..f910ae9 100644
---- a/file
-+++ b/file
-@@ -1,4 +1,4 @@
- baseline
- content
--newcontent
-+more
- lines
-EOF
+	cat >expected <<-\EOF
+	diff --git a/file b/file
+	index b5dd6c9..f910ae9 100644
+	--- a/file
+	+++ b/file
+	@@ -1,4 +1,4 @@
+	 baseline
+	 content
+	-newcontent
+	+more
+	 lines
+	EOF
 '
 
 test_expect_success 'real edit works' '
 	(echo e; echo n; echo d) | git add -p &&
 	git diff >output &&
-	test_cmp expected output
+	diff_cmp expected output
 '
 
 test_expect_success 'skip files similarly as commit -a' '
@@ -178,7 +184,7 @@ test_expect_success 'skip files similarly as commit -a' '
 	git reset &&
 	git commit -am commit &&
 	git diff >expected &&
-	test_cmp expected output &&
+	diff_cmp expected output &&
 	git reset --hard HEAD^
 '
 rm -f .gitignore
@@ -222,52 +228,67 @@ test_expect_success 'setup again' '
 
 # Write the patch file with a new line at the top and bottom
 test_expect_success 'setup patch' '
-cat >patch <<EOF
-index 180b47c..b6f2c08 100644
---- a/file
-+++ b/file
-@@ -1,2 +1,4 @@
-+firstline
- baseline
- content
-+lastline
-EOF
-'
-
-# Expected output, similar to the patch but w/ diff at the top
+	cat >patch <<-\EOF
+	index 180b47c..b6f2c08 100644
+	--- a/file
+	+++ b/file
+	@@ -1,2 +1,4 @@
+	+firstline
+	 baseline
+	 content
+	+lastline
+	\ No newline at end of file
+	EOF
+'
+
+# Expected output, diff is similar to the patch but w/ diff at the top
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-diff --git a/file b/file
-index b6f2c08..61b9053 100755
---- a/file
-+++ b/file
-@@ -1,2 +1,4 @@
-+firstline
- baseline
- content
-+lastline
-EOF
+	echo diff --git a/file b/file >expected &&
+	cat patch |sed "/^index/s/ 100644/ 100755/" >>expected &&
+	cat >expected-output <<-\EOF
+	--- a/file
+	+++ b/file
+	@@ -1,2 +1,4 @@
+	+firstline
+	 baseline
+	 content
+	+lastline
+	\ No newline at end of file
+	@@ -1,2 +1,3 @@
+	+firstline
+	 baseline
+	 content
+	@@ -1,2 +2,3 @@
+	 baseline
+	 content
+	+lastline
+	\ No newline at end of file
+	EOF
 '
 
 # Test splitting the first patch, then adding both
-test_expect_success 'add first line works' '
+test_expect_success C_LOCALE_OUTPUT 'add first line works' '
 	git commit -am "clear local changes" &&
 	git apply patch &&
-	(echo s; echo y; echo y) | git add -p file &&
-	git diff --cached > diff &&
-	test_cmp expected diff
+	printf "%s\n" s y y | git add -p file 2>error |
+		sed -n -e "s/^Stage this hunk[^@]*\(@@ .*\)/\1/" \
+		       -e "/^[-+@ \\\\]"/p  >output &&
+	test_must_be_empty error &&
+	git diff --cached >diff &&
+	diff_cmp expected diff &&
+	test_cmp expected-output output
 '
 
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-diff --git a/non-empty b/non-empty
-deleted file mode 100644
-index d95f3ad..0000000
---- a/non-empty
-+++ /dev/null
-@@ -1 +0,0 @@
--content
-EOF
+	cat >expected <<-\EOF
+	diff --git a/non-empty b/non-empty
+	deleted file mode 100644
+	index d95f3ad..0000000
+	--- a/non-empty
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-content
+	EOF
 '
 
 test_expect_success 'deleting a non-empty file' '
@@ -278,15 +299,15 @@ test_expect_success 'deleting a non-empty file' '
 	rm non-empty &&
 	echo y | git add -p non-empty &&
 	git diff --cached >diff &&
-	test_cmp expected diff
+	diff_cmp expected diff
 '
 
 test_expect_success 'setup expected' '
-cat >expected <<EOF
-diff --git a/empty b/empty
-deleted file mode 100644
-index e69de29..0000000
-EOF
+	cat >expected <<-\EOF
+	diff --git a/empty b/empty
+	deleted file mode 100644
+	index e69de29..0000000
+	EOF
 '
 
 test_expect_success 'deleting an empty file' '
@@ -297,23 +318,17 @@ test_expect_success 'deleting an empty file' '
 	rm empty &&
 	echo y | git add -p empty &&
 	git diff --cached >diff &&
-	test_cmp expected diff
+	diff_cmp expected diff
 '
 
 test_expect_success 'split hunk setup' '
 	git reset --hard &&
-	for i in 10 20 30 40 50 60
-	do
-		echo $i
-	done >test &&
+	test_write_lines 10 20 30 40 50 60 >test &&
 	git add test &&
 	test_tick &&
 	git commit -m test &&
 
-	for i in 10 15 20 21 22 23 24 30 40 50 60
-	do
-		echo $i
-	done >test
+	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
 '
 
 test_expect_success 'split hunk "add -p (edit)"' '
@@ -334,17 +349,7 @@ test_expect_success 'split hunk "add -p (edit)"' '
 '
 
 test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
-	cat >test <<-\EOF &&
-	5
-	10
-	20
-	21
-	30
-	31
-	40
-	50
-	60
-	EOF
+	test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
 	git reset &&
 	# test sequence is s(plit), n(o), y(es), e(dit)
 	# q n q q is there to make sure we exit at the end.
@@ -378,7 +383,7 @@ test_expect_success 'patch mode ignores unmerged entries' '
 	+changed
 	EOF
 	git diff --cached >diff &&
-	test_cmp expected diff
+	diff_cmp expected diff
 '
 
 test_expect_success TTY 'diffs can be colorized' '
@@ -392,6 +397,26 @@ test_expect_success TTY 'diffs can be colorized' '
 	grep "$(printf "\\033")" output
 '
 
+test_expect_success TTY 'diffFilter filters diff' '
+	git reset --hard &&
+
+	echo content >test &&
+	test_config interactive.diffFilter "sed s/^/foo:/" &&
+	printf y | test_terminal git add -p >output 2>&1 &&
+
+	# avoid depending on the exact coloring or content of the prompts,
+	# and just make sure we saw our diff prefixed
+	grep foo:.*content output
+'
+
+test_expect_success TTY 'detect bogus diffFilter output' '
+	git reset --hard &&
+
+	echo content >test &&
+	test_config interactive.diffFilter "echo too-short" &&
+	printf y | test_must_fail test_terminal git add -p
+'
+
 test_expect_success 'patch-mode via -i prompts for files' '
 	git reset --hard &&
 
@@ -407,7 +432,7 @@ test_expect_success 'patch-mode via -i prompts for files' '
 
 	echo test >expect &&
 	git diff --cached --name-only >actual &&
-	test_cmp expect actual
+	diff_cmp expect actual
 '
 
 test_expect_success 'add -p handles globs' '
@@ -541,4 +566,34 @@ test_expect_success 'status ignores dirty submodules (except HEAD)' '
 	! grep dirty-otherwise output
 '
 
+test_expect_success 'set up pathological context' '
+	git reset --hard &&
+	test_write_lines a a a a a a a a a a a >a &&
+	git add a &&
+	git commit -m a &&
+	test_write_lines c b a a a a a a a b a a a a >a &&
+	test_write_lines     a a a a a a a b a a a a >expected-1 &&
+	test_write_lines   b a a a a a a a b a a a a >expected-2 &&
+	# check editing can cope with missing header and deleted context lines
+	# as well as changes to other lines
+	test_write_lines +b " a" >patch
+'
+
+test_expect_success 'add -p works with pathological context lines' '
+	git reset &&
+	printf "%s\n" n y |
+	git add -p &&
+	git cat-file blob :a >actual &&
+	test_cmp expected-1 actual
+'
+
+test_expect_success 'add -p patch editing works with pathological context lines' '
+	git reset &&
+	# n q q below is in case edit fails
+	printf "%s\n" e y    n q q |
+	git add -p &&
+	git cat-file blob :a >actual &&
+	test_cmp expected-2 actual
+'
+
 test_done
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index bfde405..3ea5b9b 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -228,4 +228,56 @@ test_expect_success 'stash previously ignored file' '
 	test_path_is_file ignored.d/foo
 '
 
+test_expect_success 'stash -u -- <untracked> doesnt print error' '
+	>untracked &&
+	git stash push -u -- untracked 2>actual &&
+	test_path_is_missing untracked &&
+	test_line_count = 0 actual
+'
+
+test_expect_success 'stash -u -- <untracked> leaves rest of working tree in place' '
+	>tracked &&
+	git add tracked &&
+	>untracked &&
+	git stash push -u -- untracked &&
+	test_path_is_missing untracked &&
+	test_path_is_file tracked
+'
+
+test_expect_success 'stash -u -- <tracked> <untracked> clears changes in both' '
+	>tracked &&
+	git add tracked &&
+	>untracked &&
+	git stash push -u -- tracked untracked &&
+	test_path_is_missing tracked &&
+	test_path_is_missing untracked
+'
+
+test_expect_success 'stash --all -- <ignored> stashes ignored file' '
+	>ignored.d/bar &&
+	git stash push --all -- ignored.d/bar &&
+	test_path_is_missing ignored.d/bar
+'
+
+test_expect_success 'stash --all -- <tracked> <ignored> clears changes in both' '
+	>tracked &&
+	git add tracked &&
+	>ignored.d/bar &&
+	git stash push --all -- tracked ignored.d/bar &&
+	test_path_is_missing tracked &&
+	test_path_is_missing ignored.d/bar
+'
+
+test_expect_success 'stash -u -- <ignored> leaves ignored file alone' '
+	>ignored.d/bar &&
+	git stash push -u -- ignored.d/bar &&
+	test_path_is_file ignored.d/bar
+'
+
+test_expect_success 'stash -u -- <non-existant> shows no changes when there are none' '
+	git stash push -u -- non-existant >actual &&
+	echo "No local changes to save" >expect &&
+	test_i18ncmp expect actual
+'
+
 test_done
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index eadf4f6..a07816d 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -134,11 +134,15 @@ test_expect_success 'favour same basenames over different ones' '
 	git rm path1 &&
 	mkdir subdir &&
 	git mv another-path subdir/path1 &&
-	git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
+	git status >out &&
+	test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+'
 
 test_expect_success 'favour same basenames even with minor differences' '
 	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
-	git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
+	git status >out &&
+	test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+'
 
 test_expect_success 'two files with same basename and same content' '
 	git reset --hard &&
@@ -148,7 +152,8 @@ test_expect_success 'two files with same basename and same content' '
 	git add dir &&
 	git commit -m 2 &&
 	git mv dir other-dir &&
-	git status | test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file"
+	git status >out &&
+	test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" out
 '
 
 test_expect_success 'setup for many rename source candidates' '
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index f10798b..3f9a24f 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -361,6 +361,11 @@ diff --no-index --raw dir2 dir
 diff --no-index --raw --abbrev=4 dir2 dir
 :noellipses diff --no-index --raw --abbrev=4 dir2 dir
 diff --no-index --raw --no-abbrev dir2 dir
+
+diff-tree --pretty --root --stat --compact-summary initial
+diff-tree --pretty -R --root --stat --compact-summary initial
+diff-tree --stat --compact-summary initial mode
+diff-tree -R --stat --compact-summary initial mode
 EOF
 
 test_expect_success 'log -S requires an argument' '
diff --git a/t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial b/t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial
new file mode 100644
index 0000000..d6451ff
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial
@@ -0,0 +1,12 @@
+$ git diff-tree --pretty --root --stat --compact-summary initial
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+
+ dir/sub (new) | 2 ++
+ file0 (new)   | 3 +++
+ file2 (new)   | 3 +++
+ 3 files changed, 8 insertions(+)
+$
diff --git a/t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial b/t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial
new file mode 100644
index 0000000..1989e55
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial
@@ -0,0 +1,12 @@
+$ git diff-tree --pretty -R --root --stat --compact-summary initial
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+
+ dir/sub (gone) | 2 --
+ file0 (gone)   | 3 ---
+ file2 (gone)   | 3 ---
+ 3 files changed, 8 deletions(-)
+$
diff --git a/t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode b/t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode
new file mode 100644
index 0000000..9c7c8f6
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode
@@ -0,0 +1,4 @@
+$ git diff-tree --stat --compact-summary initial mode
+ file0 (mode +x) | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+$
diff --git a/t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode b/t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode
new file mode 100644
index 0000000..e38f3d3
--- /dev/null
+++ b/t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode
@@ -0,0 +1,4 @@
+$ git diff-tree -R --stat --compact-summary initial mode
+ file0 (mode -x) | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+$
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 1795ffc..22f9f88 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -33,6 +33,7 @@ diffpatterns="
 	css
 	fortran
 	fountain
+	golang
 	html
 	java
 	matlab
diff --git a/t/t4018/golang-complex-function b/t/t4018/golang-complex-function
new file mode 100644
index 0000000..e057dce
--- /dev/null
+++ b/t/t4018/golang-complex-function
@@ -0,0 +1,8 @@
+type Test struct {
+	a Type
+}
+
+func (t *Test) RIGHT(a Type) (Type, error) {
+	t.a = a
+	return ChangeMe, nil
+}
diff --git a/t/t4018/golang-func b/t/t4018/golang-func
new file mode 100644
index 0000000..8e9c9ac
--- /dev/null
+++ b/t/t4018/golang-func
@@ -0,0 +1,4 @@
+func RIGHT() {
+	a := 5
+	b := ChangeMe
+}
diff --git a/t/t4018/golang-interface b/t/t4018/golang-interface
new file mode 100644
index 0000000..553bede
--- /dev/null
+++ b/t/t4018/golang-interface
@@ -0,0 +1,4 @@
+type RIGHT interface {
+	a() Type
+	b() ChangeMe
+}
diff --git a/t/t4018/golang-long-func b/t/t4018/golang-long-func
new file mode 100644
index 0000000..ac3a77b
--- /dev/null
+++ b/t/t4018/golang-long-func
@@ -0,0 +1,5 @@
+func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
+	anotherLongVariableName AnotherLongType) {
+	a := 5
+	b := ChangeMe
+}
diff --git a/t/t4018/golang-struct b/t/t4018/golang-struct
new file mode 100644
index 0000000..5deda77
--- /dev/null
+++ b/t/t4018/golang-struct
@@ -0,0 +1,4 @@
+type RIGHT struct {
+	a Type
+	b ChangeMe
+}
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 9f563db..6e2cf93 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -19,17 +19,33 @@ test_expect_success 'preparation' '
 	git commit -m message "$name"
 '
 
+cat >expect72 <<-'EOF'
+ ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
+EOF
+test_expect_success "format-patch: small change with long name gives more space to the name" '
+	git format-patch -1 --stdout >output &&
+	grep " | " output >actual &&
+	test_cmp expect72 actual
+'
+
 while read cmd args
 do
-	cat >expect <<-'EOF'
+	cat >expect80 <<-'EOF'
 	 ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
 	EOF
 	test_expect_success "$cmd: small change with long name gives more space to the name" '
 		git $cmd $args >output &&
 		grep " | " output >actual &&
-		test_cmp expect actual
+		test_cmp expect80 actual
 	'
+done <<\EOF
+diff HEAD^ HEAD --stat
+show --stat
+log -1 --stat
+EOF
 
+while read cmd args
+do
 	cat >expect <<-'EOF'
 	 ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
 	EOF
@@ -79,11 +95,11 @@ test_expect_success 'preparation for big change tests' '
 	git commit -m message abcd
 '
 
-cat >expect80 <<'EOF'
- abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+cat >expect72 <<'EOF'
+ abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 EOF
-cat >expect80-graph <<'EOF'
-|  abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+cat >expect72-graph <<'EOF'
+|  abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 EOF
 cat >expect200 <<'EOF'
  abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -107,7 +123,7 @@ do
 		test_cmp "$expect-graph" actual
 	'
 done <<\EOF
-ignores expect80 format-patch -1 --stdout
+ignores expect72 format-patch -1 --stdout
 respects expect200 diff HEAD^ HEAD --stat
 respects expect200 show --stat
 respects expect200 log -1 --stat
@@ -135,7 +151,7 @@ do
 		test_cmp "$expect-graph" actual
 	'
 done <<\EOF
-ignores expect80 format-patch -1 --stdout
+ignores expect72 format-patch -1 --stdout
 respects expect40 diff HEAD^ HEAD --stat
 respects expect40 show --stat
 respects expect40 log -1 --stat
@@ -163,7 +179,7 @@ do
 		test_cmp "$expect-graph" actual
 	'
 done <<\EOF
-ignores expect80 format-patch -1 --stdout
+ignores expect72 format-patch -1 --stdout
 respects expect40 diff HEAD^ HEAD --stat
 respects expect40 show --stat
 respects expect40 log -1 --stat
@@ -250,11 +266,11 @@ show --stat
 log -1 --stat
 EOF
 
-cat >expect80 <<'EOF'
- ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++
+cat >expect72 <<'EOF'
+ ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++
 EOF
-cat >expect80-graph <<'EOF'
-|  ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++
+cat >expect72-graph <<'EOF'
+|  ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++
 EOF
 cat >expect200 <<'EOF'
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -278,7 +294,7 @@ do
 		test_cmp "$expect-graph" actual
 	'
 done <<\EOF
-ignores expect80 format-patch -1 --stdout
+ignores expect72 format-patch -1 --stdout
 respects expect200 diff HEAD^ HEAD --stat
 respects expect200 show --stat
 respects expect200 log -1 --stat
@@ -308,7 +324,7 @@ do
 		test_cmp "$expect-graph" actual
 	'
 done <<\EOF
-ignores expect80 format-patch -1 --stdout
+ignores expect72 format-patch -1 --stdout
 respects expect1 diff HEAD^ HEAD --stat
 respects expect1 show --stat
 respects expect1 log -1 --stat
diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh
index 27cb000..c7c688f 100755
--- a/t/t4135-apply-weird-filenames.sh
+++ b/t/t4135-apply-weird-filenames.sh
@@ -89,4 +89,21 @@ test_expect_success 'traditional, whitespace-damaged, colon in timezone' '
 	test_cmp expected "post image.txt"
 '
 
+cat >diff-from-svn <<\EOF
+Index: Makefile
+===================================================================
+diff --git a/branches/Makefile
+deleted file mode 100644
+--- a/branches/Makefile	(revision 13)
++++ /dev/null	(nonexistent)
+@@ +1 0,0 @@
+-
+EOF
+
+test_expect_success 'apply handles a diff generated by Subversion' '
+	>Makefile &&
+	git apply -p2 diff-from-svn &&
+	test_path_is_missing Makefile
+'
+
 test_done
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 73b67b4..1eccfb7 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -662,6 +662,11 @@ test_expect_success 'am pauses on conflict' '
 	test -d .git/rebase-apply
 '
 
+test_expect_success 'am --show-current-patch' '
+	git am --show-current-patch >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+'
+
 test_expect_success 'am --skip works' '
 	echo goodbye >expected &&
 	git am --skip &&
@@ -1045,4 +1050,16 @@ test_expect_success 'am works with multi-line in-body headers' '
 	git cat-file commit HEAD | grep "^$LONG$"
 '
 
+test_expect_success 'am --quit keeps HEAD where it is' '
+	mkdir .git/rebase-apply &&
+	>.git/rebase-apply/last &&
+	>.git/rebase-apply/next &&
+	git rev-parse HEAD^ >.git/ORIG_HEAD &&
+	git rev-parse HEAD >expected &&
+	git am --quit &&
+	test_path_is_missing .git/rebase-apply &&
+	git rev-parse HEAD >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 9473c27..1643278 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -46,9 +46,8 @@ do
 
 	test_expect_success "am$with3 --skip continue after failed am$with3" '
 		test_must_fail git am$with3 --skip >output &&
-		test_i18ngrep "^Applying" output >output.applying &&
-		test_i18ngrep "^Applying: 6$" output.applying &&
-		test_i18ncmp file-2-expect file-2 &&
+		test_i18ngrep "^Applying: 6$" output &&
+		test_cmp file-2-expect file-2 &&
 		test ! -f .git/MERGE_RR
 	'
 
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index da10478..ff6649e 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -127,6 +127,11 @@ test_expect_success !MINGW 'shortlog can read --format=raw output' '
 	test_cmp expect out
 '
 
+test_expect_success 'shortlog from non-git directory refuses extra arguments' '
+	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
+	test_i18ngrep "too many arguments" out
+'
+
 test_expect_success 'shortlog should add newline when input line matches wraplen' '
 	cat >expect <<\EOF &&
 A U Thor (2):
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index c2fc584..d695a60 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -262,4 +262,9 @@ EOF
     grep "^warning:.* expected .tagger. line" err
 '
 
+test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in tag' '
+    git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
+    grep "^warning:.* expected .tagger. line" err
+'
+
 test_done
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index ec9ba9b..0680dec 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -482,24 +482,24 @@ test_expect_success 'set up tests of missing reference' '
 test_expect_success 'test lonely missing ref' '
 	(
 		cd client &&
-		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy
-	) >/dev/null 2>error-m &&
+		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
+	) &&
 	test_i18ncmp expect-error error-m
 '
 
 test_expect_success 'test missing ref after existing' '
 	(
 		cd client &&
-		test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy
-	) >/dev/null 2>error-em &&
+		test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
+	) &&
 	test_i18ncmp expect-error error-em
 '
 
 test_expect_success 'test missing ref before existing' '
 	(
 		cd client &&
-		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A
-	) >/dev/null 2>error-me &&
+		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
+	) &&
 	test_i18ncmp expect-error error-me
 '
 
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 668c54b..da9ac00 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -222,12 +222,9 @@ test_expect_success 'fetch uses remote ref names to describe new refs' '
 	(
 		cd descriptive &&
 		git fetch o 2>actual &&
-		grep " -> refs/crazyheads/descriptive-branch$" actual |
-		test_i18ngrep "new branch" &&
-		grep " -> descriptive-tag$" actual |
-		test_i18ngrep "new tag" &&
-		grep " -> crazy$" actual |
-		test_i18ngrep "new ref"
+		test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
+		test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
+		test_i18ngrep "new ref.* -> crazy$" actual
 	) &&
 	git checkout master
 '
@@ -543,82 +540,232 @@ test_expect_success "should be able to fetch with duplicate refspecs" '
 set_config_tristate () {
 	# var=$1 val=$2
 	case "$2" in
-	unset)  test_unconfig "$1" ;;
-	*)	git config "$1" "$2" ;;
+	unset)
+		test_unconfig "$1"
+		;;
+	*)
+		git config "$1" "$2"
+		key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
+		git_fetch_c="$git_fetch_c -c $key=$2"
+		;;
 	esac
 }
 
 test_configured_prune () {
-	fetch_prune=$1 remote_origin_prune=$2 cmdline=$3 expected=$4
+	test_configured_prune_type "$@" "name"
+	test_configured_prune_type "$@" "link"
+}
 
-	test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
+test_configured_prune_type () {
+	fetch_prune=$1
+	remote_origin_prune=$2
+	fetch_prune_tags=$3
+	remote_origin_prune_tags=$4
+	expected_branch=$5
+	expected_tag=$6
+	cmdline=$7
+	mode=$8
+
+	if test -z "$cmdline_setup"
+	then
+		test_expect_success 'setup cmdline_setup variable for subsequent test' '
+			remote_url="file://$(git -C one config remote.origin.url)" &&
+			remote_fetch="$(git -C one config remote.origin.fetch)" &&
+			cmdline_setup="\"$remote_url\" \"$remote_fetch\""
+		'
+	fi
+
+	if test "$mode" = 'link'
+	then
+		new_cmdline=""
+
+		if test "$cmdline" = ""
+		then
+			new_cmdline=$cmdline_setup
+		else
+			new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
+		fi
+
+		if test "$fetch_prune_tags" = 'true' ||
+		   test "$remote_origin_prune_tags" = 'true'
+		then
+			if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
+			then
+				new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
+			fi
+		fi
+
+		cmdline="$new_cmdline"
+	fi
+
+	test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2 fetch.pruneTags=$3 remote.origin.pruneTags=$4${7:+ $7}; branch:$5 tag:$6" '
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
+		git tag -f newtag &&
 		(
 			cd one &&
 			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
 			test_unconfig remote.origin.prune &&
-			git fetch &&
-			git rev-parse --verify refs/remotes/origin/newbranch
+			test_unconfig remote.origin.pruneTags &&
+			git fetch '"$cmdline_setup"' &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
 		) &&
 
 		# now remove it
 		git branch -d newbranch &&
+		git tag -d newtag &&
 
 		# then test
 		(
 			cd one &&
+			git_fetch_c="" &&
 			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
 			set_config_tristate remote.origin.prune $remote_origin_prune &&
-
-			git fetch $cmdline &&
-			case "$expected" in
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch '"$cmdline"' &&
+			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
 				;;
 			kept)
 				git rev-parse --verify refs/remotes/origin/newbranch
 				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
 			esac
 		)
 	'
 }
 
-test_configured_prune unset unset ""		kept
-test_configured_prune unset unset "--no-prune"	kept
-test_configured_prune unset unset "--prune"	pruned
-
-test_configured_prune false unset ""		kept
-test_configured_prune false unset "--no-prune"	kept
-test_configured_prune false unset "--prune"	pruned
-
-test_configured_prune true  unset ""		pruned
-test_configured_prune true  unset "--prune"	pruned
-test_configured_prune true  unset "--no-prune"	kept
-
-test_configured_prune unset false ""		kept
-test_configured_prune unset false "--no-prune"	kept
-test_configured_prune unset false "--prune"	pruned
-
-test_configured_prune false false ""		kept
-test_configured_prune false false "--no-prune"	kept
-test_configured_prune false false "--prune"	pruned
-
-test_configured_prune true  false ""		kept
-test_configured_prune true  false "--prune"	pruned
-test_configured_prune true  false "--no-prune"	kept
-
-test_configured_prune unset true  ""		pruned
-test_configured_prune unset true  "--no-prune"	kept
-test_configured_prune unset true  "--prune"	pruned
-
-test_configured_prune false true  ""		pruned
-test_configured_prune false true  "--no-prune"	kept
-test_configured_prune false true  "--prune"	pruned
-
-test_configured_prune true  true  ""		pruned
-test_configured_prune true  true  "--prune"	pruned
-test_configured_prune true  true  "--no-prune"	kept
+# $1 config: fetch.prune
+# $2 config: remote.<name>.prune
+# $3 config: fetch.pruneTags
+# $4 config: remote.<name>.pruneTags
+# $5 expect: branch to be pruned?
+# $6 expect: tag to be pruned?
+# $7 git-fetch $cmdline:
+#
+#                     $1    $2    $3    $4    $5     $6     $7
+test_configured_prune unset unset unset unset kept   kept   ""
+test_configured_prune unset unset unset unset kept   kept   "--no-prune"
+test_configured_prune unset unset unset unset pruned kept   "--prune"
+test_configured_prune unset unset unset unset kept   pruned \
+	"--prune origin refs/tags/*:refs/tags/*"
+test_configured_prune unset unset unset unset pruned pruned \
+	"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
+
+test_configured_prune false unset unset unset kept   kept   ""
+test_configured_prune false unset unset unset kept   kept   "--no-prune"
+test_configured_prune false unset unset unset pruned kept   "--prune"
+
+test_configured_prune true  unset unset unset pruned kept   ""
+test_configured_prune true  unset unset unset pruned kept   "--prune"
+test_configured_prune true  unset unset unset kept   kept   "--no-prune"
+
+test_configured_prune unset false unset unset kept   kept   ""
+test_configured_prune unset false unset unset kept   kept   "--no-prune"
+test_configured_prune unset false unset unset pruned kept   "--prune"
+
+test_configured_prune false false unset unset kept   kept   ""
+test_configured_prune false false unset unset kept   kept   "--no-prune"
+test_configured_prune false false unset unset pruned kept   "--prune"
+test_configured_prune false false unset unset kept   pruned \
+	"--prune origin refs/tags/*:refs/tags/*"
+test_configured_prune false false unset unset pruned pruned \
+	"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
+
+test_configured_prune true  false unset unset kept   kept   ""
+test_configured_prune true  false unset unset pruned kept   "--prune"
+test_configured_prune true  false unset unset kept   kept   "--no-prune"
+
+test_configured_prune unset true  unset unset pruned kept   ""
+test_configured_prune unset true  unset unset kept   kept   "--no-prune"
+test_configured_prune unset true  unset unset pruned kept   "--prune"
+
+test_configured_prune false true  unset unset pruned kept   ""
+test_configured_prune false true  unset unset kept   kept   "--no-prune"
+test_configured_prune false true  unset unset pruned kept   "--prune"
+
+test_configured_prune true  true  unset unset pruned kept   ""
+test_configured_prune true  true  unset unset pruned kept   "--prune"
+test_configured_prune true  true  unset unset kept   kept   "--no-prune"
+test_configured_prune true  true  unset unset kept   pruned \
+	"--prune origin refs/tags/*:refs/tags/*"
+test_configured_prune true  true  unset unset pruned pruned \
+	"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
+
+# --prune-tags on its own does nothing, needs --prune as well, same
+# for for fetch.pruneTags without fetch.prune
+test_configured_prune unset unset unset unset kept kept     "--prune-tags"
+test_configured_prune unset unset true unset  kept kept     ""
+test_configured_prune unset unset unset true  kept kept     ""
+
+# These will prune the tags
+test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
+test_configured_prune true  unset true  unset pruned pruned ""
+test_configured_prune unset true  unset true  pruned pruned ""
+
+# remote.<name>.pruneTags overrides fetch.pruneTags, just like
+# remote.<name>.prune overrides fetch.prune if set.
+test_configured_prune true  unset true unset pruned pruned  ""
+test_configured_prune false true  false true  pruned pruned ""
+test_configured_prune true  false true  false kept   kept   ""
+
+# When --prune-tags is supplied it's ignored if an explicit refspec is
+# given, same for the configuration options.
+test_configured_prune unset unset unset unset pruned kept \
+	"--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
+test_configured_prune unset unset true  unset pruned kept \
+	"--prune origin +refs/heads/*:refs/remotes/origin/*"
+test_configured_prune unset unset unset true pruned  kept \
+	"--prune origin +refs/heads/*:refs/remotes/origin/*"
+
+# Pruning that also takes place if a file:// url replaces a named
+# remote. However, because there's no implicit
+# +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
+# command-line negates --prune-tags, the branches will not be pruned.
+test_configured_prune_type unset unset unset unset kept   kept   "origin --prune-tags" "name"
+test_configured_prune_type unset unset unset unset kept   kept   "origin --prune-tags" "link"
+test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
+test_configured_prune_type unset unset unset unset kept   pruned "origin --prune --prune-tags" "link"
+test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
+test_configured_prune_type unset unset unset unset kept   pruned "--prune --prune-tags origin" "link"
+test_configured_prune_type unset unset true  unset pruned pruned "--prune origin" "name"
+test_configured_prune_type unset unset true  unset kept   pruned "--prune origin" "link"
+test_configured_prune_type unset unset unset true  pruned pruned "--prune origin" "name"
+test_configured_prune_type unset unset unset true  kept   pruned "--prune origin" "link"
+test_configured_prune_type true  unset true  unset pruned pruned "origin" "name"
+test_configured_prune_type true  unset true  unset kept   pruned "origin" "link"
+test_configured_prune_type unset  true true  unset pruned pruned "origin" "name"
+test_configured_prune_type unset  true true  unset kept   pruned "origin" "link"
+test_configured_prune_type unset  true unset true  pruned pruned "origin" "name"
+test_configured_prune_type unset  true unset true  kept   pruned "origin" "link"
+
+# When all remote.origin.fetch settings are deleted a --prune
+# --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
+# tags, but not tracking branches, will be deleted.
+test_expect_success 'remove remote.origin.fetch "one"' '
+	(
+		cd one &&
+		git config --unset-all remote.origin.fetch
+	)
+'
+test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
+test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
 
 test_expect_success 'all boundary commits are excluded' '
 	test_commit base &&
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index a552ad4..9cc4b56 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -85,7 +85,7 @@ test_expect_success "fetch --recurse-submodules -j2 has the same output behaviou
 	add_upstream_commit &&
 	(
 		cd downstream &&
-		GIT_TRACE=$(pwd)/../trace.out git fetch --recurse-submodules -j2 2>../actual.err
+		GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err &&
@@ -485,7 +485,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
 	)
 '
 
-test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodule entry" '
+test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 2e42cf3..91f28c2 100755
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -18,14 +18,6 @@ setup_repository () {
 	)
 }
 
-verify_stderr () {
-	cat >expected &&
-	# We're not interested in the error
-	# "fatal: The remote end hung up unexpectedly":
-	test_i18ngrep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
-	test_i18ncmp expected actual
-}
-
 test_expect_success 'setup' '
 	git commit --allow-empty -m "Initial" &&
 	git branch branch1 &&
@@ -48,9 +40,7 @@ test_expect_success 'fetch conflict: config vs. config' '
 		"+refs/heads/branch2:refs/remotes/origin/branch1" && (
 		cd ccc &&
 		test_must_fail git fetch origin 2>error &&
-		verify_stderr <<-\EOF
-		fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-		EOF
+		test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
 	)
 '
 
@@ -77,9 +67,7 @@ test_expect_success 'fetch conflict: arg vs. arg' '
 		test_must_fail git fetch origin \
 			refs/heads/*:refs/remotes/origin/* \
 			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-		verify_stderr <<-\EOF
-		fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-		EOF
+		test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
 	)
 '
 
@@ -90,10 +78,8 @@ test_expect_success 'fetch conflict: criss-cross args' '
 		git fetch origin \
 			refs/heads/branch1:refs/remotes/origin/branch2 \
 			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-		verify_stderr <<-\EOF
-		warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2
-		warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1
-		EOF
+		test_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
+		test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
 	)
 '
 
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index d38bf32..21340e8 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -234,7 +234,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
 	test_commit no-progress &&
 	test_terminal git push --no-progress >output 2>&1 &&
 	test_i18ngrep "^To http" output &&
-	test_i18ngrep ! "^Writing objects"
+	test_i18ngrep ! "^Writing objects" output
 '
 
 test_expect_success 'push --progress shows progress to non-tty' '
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 4637837..b47a958 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -217,17 +217,32 @@ test_expect_success 'invalid push option in config' '
 	test_refs master HEAD@{1}
 '
 
+test_expect_success 'push options keep quoted characters intact (direct)' '
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	test_commit -C workbench one &&
+	git -C workbench push --push-option="\"embedded quotes\"" up master &&
+	echo "\"embedded quotes\"" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
-test_expect_success 'push option denied properly by http server' '
+# set up http repository for fetching/pushing, with push options config
+# bool set to $1
+mk_http_pair () {
 	test_when_finished "rm -rf test_http_clone" &&
-	test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH\"/upstream.git" &&
+	test_when_finished 'rm -rf "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git' &&
 	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions false &&
+	git -C upstream config receive.advertisePushOptions "$1" &&
 	git -C upstream config http.receivepack true &&
 	cp -R upstream/.git "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git &&
-	git clone "$HTTPD_URL"/smart/upstream test_http_clone &&
+	git clone "$HTTPD_URL"/smart/upstream test_http_clone
+}
+
+test_expect_success 'push option denied properly by http server' '
+	mk_http_pair false &&
 	test_commit -C test_http_clone one &&
 	test_must_fail git -C test_http_clone push --push-option=asdf origin master 2>actual &&
 	test_i18ngrep "the receiving end does not support push options" actual &&
@@ -235,13 +250,7 @@ test_expect_success 'push option denied properly by http server' '
 '
 
 test_expect_success 'push options work properly across http' '
-	test_when_finished "rm -rf test_http_clone" &&
-	test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH\"/upstream.git" &&
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	git -C upstream config http.receivepack true &&
-	cp -R upstream/.git "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git &&
-	git clone "$HTTPD_URL"/smart/upstream test_http_clone &&
+	mk_http_pair true &&
 
 	test_commit -C test_http_clone one &&
 	git -C test_http_clone push origin master &&
@@ -260,6 +269,15 @@ test_expect_success 'push options work properly across http' '
 	test_cmp expect actual
 '
 
+test_expect_success 'push options keep quoted characters intact (http)' '
+	mk_http_pair true &&
+
+	test_commit -C test_http_clone one &&
+	git -C test_http_clone push --push-option="\"embedded quotes\"" origin master &&
+	echo "\"embedded quotes\"" >expect &&
+	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
+'
+
 stop_httpd
 
 test_done
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 755b05a..0d4c520 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -50,7 +50,7 @@ test_expect_success 'no-op fetch -v stderr is as expected' '
 '
 
 test_expect_success 'no-op fetch without "-v" is quiet' '
-	(cd clone && git fetch) 2>stderr &&
+	(cd clone && git fetch 2>../stderr) &&
 	! test -s stderr
 '
 
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 29d8631..cee5565 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -143,4 +143,15 @@ test_expect_success 'manual prefetch of missing objects' '
 	test_line_count = 0 observed.oids
 '
 
+test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects' '
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
+
+	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src" dst &&
+	grep "git index-pack.*--fsck-objects" trace
+'
+
 test_done
diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh
index d911afd..872788a 100755
--- a/t/t5812-proto-disable-http.sh
+++ b/t/t5812-proto-disable-http.sh
@@ -20,10 +20,7 @@ test_expect_success 'curl redirects respect whitelist' '
 	test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
 			   GIT_SMART_HTTP=0 \
 		git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&
-	{
-		test_i18ngrep "ftp.*disabled" stderr ||
-		test_i18ngrep "your curl version is too old"
-	}
+	test_i18ngrep -E "(ftp.*disabled|your curl version is too old)" stderr
 '
 
 test_expect_success 'curl limits redirects' '
diff --git a/t/t6015-rev-list-show-all-parents.sh b/t/t6015-rev-list-show-all-parents.sh
deleted file mode 100755
index 3c73c93..0000000
--- a/t/t6015-rev-list-show-all-parents.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-test_description='--show-all --parents does not rewrite TREESAME commits'
-
-. ./test-lib.sh
-
-test_expect_success 'set up --show-all --parents test' '
-	test_commit one foo.txt &&
-	commit1=$(git rev-list -1 HEAD) &&
-	test_commit two bar.txt &&
-	commit2=$(git rev-list -1 HEAD) &&
-	test_commit three foo.txt &&
-	commit3=$(git rev-list -1 HEAD)
-	'
-
-test_expect_success '--parents rewrites TREESAME parents correctly' '
-	echo $commit3 $commit1 > expected &&
-	echo $commit1 >> expected &&
-	git rev-list --parents HEAD -- foo.txt > actual &&
-	test_cmp expected actual
-	'
-
-test_expect_success '--parents --show-all does not rewrites TREESAME parents' '
-	echo $commit3 $commit2 > expected &&
-	echo $commit2 $commit1 >> expected &&
-	echo $commit1 >> expected &&
-	git rev-list --parents --show-all HEAD -- foo.txt > actual &&
-	test_cmp expected actual
-	'
-
-test_done
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 05ebba7..c01f721 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -242,10 +242,12 @@ test_expect_success 'merge of identical changes in a renamed file' '
 	rm -f A M N &&
 	git reset --hard &&
 	git checkout change+rename &&
-	GIT_MERGE_VERBOSITY=3 git merge change | test_i18ngrep "^Skipped B" &&
+	GIT_MERGE_VERBOSITY=3 git merge change >out &&
+	test_i18ngrep "^Skipped B" out &&
 	git reset --hard HEAD^ &&
 	git checkout change &&
-	GIT_MERGE_VERBOSITY=3 git merge change+rename | test_i18ngrep "^Skipped B"
+	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
+	test_i18ngrep "^Skipped B" out
 '
 
 test_expect_success 'setup for rename + d/f conflicts' '
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 8f17fd9..716283b 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -147,6 +147,48 @@ test_expect_success 'status -s -b (diverged from upstream)' '
 '
 
 cat >expect <<\EOF
+## b1...origin/master [different]
+EOF
+
+test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b --no-ahead-behind | head -1
+	) >actual &&
+	test_i18ncmp expect actual
+'
+
+cat >expect <<\EOF
+On branch b1
+Your branch and 'origin/master' have diverged,
+and have 1 and 1 different commits each, respectively.
+EOF
+
+test_expect_success 'status --long --branch' '
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b | head -3
+	) >actual &&
+	test_i18ncmp expect actual
+'
+
+cat >expect <<\EOF
+On branch b1
+Your branch and 'origin/master' refer to different commits.
+EOF
+
+test_expect_success 'status --long --branch --no-ahead-behind' '
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b --no-ahead-behind | head -2
+	) >actual &&
+	test_i18ncmp expect actual
+'
+
+cat >expect <<\EOF
 ## b5...brokenbase [gone]
 EOF
 
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh
new file mode 100755
index 0000000..2e28f29
--- /dev/null
+++ b/t/t6043-merge-rename-directories.sh
@@ -0,0 +1,3998 @@
+#!/bin/sh
+
+test_description="recursive merge with directory renames"
+# includes checking of many corner cases, with a similar methodology to:
+#   t6042: corner cases with renames but not criss-cross merges
+#   t6036: corner cases with both renames and criss-cross merges
+#
+# The setup for all of them, pictorially, is:
+#
+#      A
+#      o
+#     / \
+#  O o   ?
+#     \ /
+#      o
+#      B
+#
+# To help make it easier to follow the flow of tests, they have been
+# divided into sections and each test will start with a quick explanation
+# of what commits O, A, and B contain.
+#
+# Notation:
+#    z/{b,c}   means  files z/b and z/c both exist
+#    x/d_1     means  file x/d exists with content d1.  (Purpose of the
+#                     underscore notation is to differentiate different
+#                     files that might be renamed into each other's paths.)
+
+. ./test-lib.sh
+
+
+###########################################################################
+# SECTION 1: Basic cases we should be able to handle
+###########################################################################
+
+# Testcase 1a, Basic directory rename.
+#   Commit O: z/{b,c}
+#   Commit A: y/{b,c}
+#   Commit B: z/{b,c,d,e/f}
+#   Expected: y/{b,c,d,e/f}
+
+test_expect_success '1a-setup: Simple directory rename detection' '
+	test_create_repo 1a &&
+	(
+		cd 1a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo d >z/d &&
+		mkdir z/e &&
+		echo f >z/e/f &&
+		git add z/d z/e/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '1a-check: Simple directory rename detection' '
+	(
+		cd 1a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d    B:z/e/f &&
+		test_cmp expect actual &&
+
+		git hash-object y/d >actual &&
+		git rev-parse B:z/d >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_must_fail git rev-parse HEAD:z/e/f &&
+		test_path_is_missing z/d &&
+		test_path_is_missing z/e/f
+	)
+'
+
+# Testcase 1b, Merge a directory with another
+#   Commit O: z/{b,c},   y/d
+#   Commit A: z/{b,c,e}, y/d
+#   Commit B: y/{b,c,d}
+#   Expected: y/{b,c,d,e}
+
+test_expect_success '1b-setup: Merge a directory with another' '
+	test_create_repo 1b &&
+	(
+		cd 1b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir y &&
+		echo d >y/d &&
+		git add z y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e >z/e &&
+		git add z/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z/b y &&
+		git mv z/c y &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '1b-check: Merge a directory with another' '
+	(
+		cd 1b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:y/d    A:z/e &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:z/e
+	)
+'
+
+# Testcase 1c, Transitive renaming
+#   (Related to testcases 3a and 6d -- when should a transitive rename apply?)
+#   (Related to testcases 9c and 9d -- can transitivity repeat?)
+#   (Related to testcase 12b -- joint-transitivity?)
+#   Commit O: z/{b,c},   x/d
+#   Commit A: y/{b,c},   x/d
+#   Commit B: z/{b,c,d}
+#   Expected: y/{b,c,d}  (because x/d -> z/d -> y/d)
+
+test_expect_success '1c-setup: Transitive renaming' '
+	test_create_repo 1c &&
+	(
+		cd 1c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '1c-check: Transitive renaming' '
+	(
+		cd 1c &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:x/d &&
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_path_is_missing z/d
+	)
+'
+
+# Testcase 1d, Directory renames (merging two directories into one new one)
+#              cause a rename/rename(2to1) conflict
+#   (Related to testcases 1c and 7b)
+#   Commit O. z/{b,c},        y/{d,e}
+#   Commit A. x/{b,c},        y/{d,e,m,wham_1}
+#   Commit B. z/{b,c,n,wham_2}, x/{d,e}
+#   Expected: x/{b,c,d,e,m,n}, CONFLICT:(y/wham_1 & z/wham_2 -> x/wham)
+#   Note: y/m & z/n should definitely move into x.  By the same token, both
+#         y/wham_1 & z/wham_2 should too...giving us a conflict.
+
+test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) conflict' '
+	test_create_repo 1d &&
+	(
+		cd 1d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir y &&
+		echo d >y/d &&
+		echo e >y/e &&
+		git add z y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z x &&
+		echo m >y/m &&
+		echo wham1 >y/wham &&
+		git add y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv y x &&
+		echo n >z/n &&
+		echo wham2 >z/wham &&
+		git add z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) conflict' '
+	(
+		cd 1d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 8 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:x/b :0:x/c :0:x/d :0:x/e :0:x/m :0:x/n &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:y/d  O:y/e  A:y/m  B:z/n &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :0:x/wham &&
+		git rev-parse >actual \
+			:2:x/wham :3:x/wham &&
+		git rev-parse >expect \
+			 A:y/wham  B:z/wham &&
+		test_cmp expect actual &&
+
+		test_path_is_missing x/wham &&
+		test_path_is_file x/wham~HEAD &&
+		test_path_is_file x/wham~B^0 &&
+
+		git hash-object >actual \
+			x/wham~HEAD x/wham~B^0 &&
+		git rev-parse >expect \
+			A:y/wham    B:z/wham &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 1e, Renamed directory, with all filenames being renamed too
+#   (Related to testcases 9f & 9g)
+#   Commit O: z/{oldb,oldc}
+#   Commit A: y/{newb,newc}
+#   Commit B: z/{oldb,oldc,d}
+#   Expected: y/{newb,newc,d}
+
+test_expect_success '1e-setup: Renamed directory, with all files being renamed too' '
+	test_create_repo 1e &&
+	(
+		cd 1e &&
+
+		mkdir z &&
+		echo b >z/oldb &&
+		echo c >z/oldc &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		git mv z/oldb y/newb &&
+		git mv z/oldc y/newc &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '1e-check: Renamed directory, with all files being renamed too' '
+	(
+		cd 1e &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/newb HEAD:y/newc HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/oldb    O:z/oldc    B:z/d &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:z/d
+	)
+'
+
+# Testcase 1f, Split a directory into two other directories
+#   (Related to testcases 3a, all of section 2, and all of section 4)
+#   Commit O: z/{b,c,d,e,f}
+#   Commit A: z/{b,c,d,e,f,g}
+#   Commit B: y/{b,c}, x/{d,e,f}
+#   Expected: y/{b,c}, x/{d,e,f,g}
+
+test_expect_success '1f-setup: Split a directory into two other directories' '
+	test_create_repo 1f &&
+	(
+		cd 1f &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		echo e >z/e &&
+		echo f >z/f &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo g >z/g &&
+		git add z/g &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		git mv z/e x/ &&
+		git mv z/f x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '1f-check: Split a directory into two other directories' '
+	(
+		cd 1f &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d HEAD:x/e HEAD:x/f HEAD:x/g &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    O:z/f    A:z/g &&
+		test_cmp expect actual &&
+		test_path_is_missing z/g &&
+		test_must_fail git rev-parse HEAD:z/g
+	)
+'
+
+###########################################################################
+# Rules suggested by testcases in section 1:
+#
+#   We should still detect the directory rename even if it wasn't just
+#   the directory renamed, but the files within it. (see 1b)
+#
+#   If renames split a directory into two or more others, the directory
+#   with the most renames, "wins" (see 1c).  However, see the testcases
+#   in section 2, plus testcases 3a and 4a.
+###########################################################################
+
+
+###########################################################################
+# SECTION 2: Split into multiple directories, with equal number of paths
+#
+# Explore the splitting-a-directory rules a bit; what happens in the
+# edge cases?
+#
+# Note that there is a closely related case of a directory not being
+# split on either side of history, but being renamed differently on
+# each side.  See testcase 8e for that.
+###########################################################################
+
+# Testcase 2a, Directory split into two on one side, with equal numbers of paths
+#   Commit O: z/{b,c}
+#   Commit A: y/b, w/c
+#   Commit B: z/{b,c,d}
+#   Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict
+test_expect_success '2a-setup: Directory split into two on one side, with equal numbers of paths' '
+	test_create_repo 2a &&
+	(
+		cd 2a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		mkdir w &&
+		git mv z/b y/ &&
+		git mv z/c w/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '2a-check: Directory split into two on one side, with equal numbers of paths' '
+	(
+		cd 2a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT.*directory rename split" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:w/c :0:z/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 2b, Directory split into two on one side, with equal numbers of paths
+#   Commit O: z/{b,c}
+#   Commit A: y/b, w/c
+#   Commit B: z/{b,c}, x/d
+#   Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict
+test_expect_success '2b-setup: Directory split into two on one side, with equal numbers of paths' '
+	test_create_repo 2b &&
+	(
+		cd 2b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		mkdir w &&
+		git mv z/b y/ &&
+		git mv z/c w/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir x &&
+		echo d >x/d &&
+		git add x/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '2b-check: Directory split into two on one side, with equal numbers of paths' '
+	(
+		cd 2b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 >out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:w/c :0:x/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:x/d &&
+		test_cmp expect actual &&
+		test_i18ngrep ! "CONFLICT.*directory rename split" out
+	)
+'
+
+###########################################################################
+# Rules suggested by section 2:
+#
+#   None; the rule was already covered in section 1.  These testcases are
+#   here just to make sure the conflict resolution and necessary warning
+#   messages are handled correctly.
+###########################################################################
+
+
+###########################################################################
+# SECTION 3: Path in question is the source path for some rename already
+#
+# Combining cases from Section 1 and trying to handle them could lead to
+# directory renaming detection being over-applied.  So, this section
+# provides some good testcases to check that the implementation doesn't go
+# too far.
+###########################################################################
+
+# Testcase 3a, Avoid implicit rename if involved as source on other side
+#   (Related to testcases 1c, 1f, and 9h)
+#   Commit O: z/{b,c,d}
+#   Commit A: z/{b,c,d} (no change)
+#   Commit B: y/{b,c}, x/d
+#   Expected: y/{b,c}, x/d
+test_expect_success '3a-setup: Avoid implicit rename if involved as source on other side' '
+	test_create_repo 3a &&
+	(
+		cd 3a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '3a-check: Avoid implicit rename if involved as source on other side' '
+	(
+		cd 3a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 3b, Avoid implicit rename if involved as source on other side
+#   (Related to testcases 5c and 7c, also kind of 1e and 1f)
+#   Commit O: z/{b,c,d}
+#   Commit A: y/{b,c}, x/d
+#   Commit B: z/{b,c}, w/d
+#   Expected: y/{b,c}, CONFLICT:(z/d -> x/d vs. w/d)
+#   NOTE: We're particularly checking that since z/d is already involved as
+#         a source in a file rename on the same side of history, that we don't
+#         get it involved in directory rename detection.  If it were, we might
+#         end up with CONFLICT:(z/d -> y/d vs. x/d vs. w/d), i.e. a
+#         rename/rename/rename(1to3) conflict, which is just weird.
+test_expect_success '3b-setup: Avoid implicit rename if involved as source on current side' '
+	test_create_repo 3b &&
+	(
+		cd 3b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir w &&
+		git mv z/d w/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '3b-check: Avoid implicit rename if involved as source on current side' '
+	(
+		cd 3b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
+		test_i18ngrep ! CONFLICT.*rename/rename.*y/d out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :1:z/d :2:x/d :3:w/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:z/d  O:z/d  O:z/d &&
+		test_cmp expect actual &&
+
+		test_path_is_missing z/d &&
+		git hash-object >actual \
+			x/d   w/d &&
+		git rev-parse >expect \
+			O:z/d O:z/d &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# Rules suggested by section 3:
+#
+#   Avoid directory-rename-detection for a path, if that path is the source
+#   of a rename on either side of a merge.
+###########################################################################
+
+
+###########################################################################
+# SECTION 4: Partially renamed directory; still exists on both sides of merge
+#
+# What if we were to attempt to do directory rename detection when someone
+# "mostly" moved a directory but still left some files around, or,
+# equivalently, fully renamed a directory in one commmit and then recreated
+# that directory in a later commit adding some new files and then tried to
+# merge?
+#
+# It's hard to divine user intent in these cases, because you can make an
+# argument that, depending on the intermediate history of the side being
+# merged, that some users will want files in that directory to
+# automatically be detected and renamed, while users with a different
+# intermediate history wouldn't want that rename to happen.
+#
+# I think that it is best to simply not have directory rename detection
+# apply to such cases.  My reasoning for this is four-fold: (1) it's
+# easiest for users in general to figure out what happened if we don't
+# apply directory rename detection in any such case, (2) it's an easy rule
+# to explain ["We don't do directory rename detection if the directory
+# still exists on both sides of the merge"], (3) we can get some hairy
+# edge/corner cases that would be really confusing and possibly not even
+# representable in the index if we were to even try, and [related to 3] (4)
+# attempting to resolve this issue of divining user intent by examining
+# intermediate history goes against the spirit of three-way merges and is a
+# path towards crazy corner cases that are far more complex than what we're
+# already dealing with.
+#
+# Note that the wording of the rule ("We don't do directory rename
+# detection if the directory still exists on both sides of the merge.")
+# also excludes "renaming" of a directory into a subdirectory of itself
+# (e.g. /some/dir/* -> /some/dir/subdir/*).  It may be possible to carve
+# out an exception for "renaming"-beneath-itself cases without opening
+# weird edge/corner cases for other partial directory renames, but for now
+# we are keeping the rule simple.
+#
+# This section contains a test for a partially-renamed-directory case.
+###########################################################################
+
+# Testcase 4a, Directory split, with original directory still present
+#   (Related to testcase 1f)
+#   Commit O: z/{b,c,d,e}
+#   Commit A: y/{b,c,d}, z/e
+#   Commit B: z/{b,c,d,e,f}
+#   Expected: y/{b,c,d}, z/{e,f}
+#   NOTE: Even though most files from z moved to y, we don't want f to follow.
+
+test_expect_success '4a-setup: Directory split, with original directory still present' '
+	test_create_repo 4a &&
+	(
+		cd 4a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		echo e >z/e &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo f >z/f &&
+		git add z/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '4a-check: Directory split, with original directory still present' '
+	(
+		cd 4a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/e HEAD:z/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# Rules suggested by section 4:
+#
+#   Directory-rename-detection should be turned off for any directories (as
+#   a source for renames) that exist on both sides of the merge.  (The "as
+#   a source for renames" clarification is due to cases like 1c where
+#   the target directory exists on both sides and we do want the rename
+#   detection.)  But, sadly, see testcase 8b.
+###########################################################################
+
+
+###########################################################################
+# SECTION 5: Files/directories in the way of subset of to-be-renamed paths
+#
+# Implicitly renaming files due to a detected directory rename could run
+# into problems if there are files or directories in the way of the paths
+# we want to rename.  Explore such cases in this section.
+###########################################################################
+
+# Testcase 5a, Merge directories, other side adds files to original and target
+#   Commit O: z/{b,c},       y/d
+#   Commit A: z/{b,c,e_1,f}, y/{d,e_2}
+#   Commit B: y/{b,c,d}
+#   Expected: z/e_1, y/{b,c,d,e_2,f} + CONFLICT warning
+#   NOTE: While directory rename detection is active here causing z/f to
+#         become y/f, we did not apply this for z/e_1 because that would
+#         give us an add/add conflict for y/e_1 vs y/e_2.  This problem with
+#         this add/add, is that both versions of y/e are from the same side
+#         of history, giving us no way to represent this conflict in the
+#         index.
+
+test_expect_success '5a-setup: Merge directories, other side adds files to original and target' '
+	test_create_repo 5a &&
+	(
+		cd 5a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir y &&
+		echo d >y/d &&
+		git add z y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e1 >z/e &&
+		echo f >z/f &&
+		echo e2 >y/e &&
+		git add z/e z/f y/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '5a-check: Merge directories, other side adds files to original and target' '
+	(
+		cd 5a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT.*implicit dir rename" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/d :0:y/e :0:z/e :0:y/f &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:y/d  A:y/e  A:z/e  A:z/f &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 5b, Rename/delete in order to get add/add/add conflict
+#   (Related to testcase 8d; these may appear slightly inconsistent to users;
+#    Also related to testcases 7d and 7e)
+#   Commit O: z/{b,c,d_1}
+#   Commit A: y/{b,c,d_2}
+#   Commit B: z/{b,c,d_1,e}, y/d_3
+#   Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3)
+#   NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as
+#         we normaly would since z/ is being renamed to y/, then this would be
+#         a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add
+#         conflict of y/d_1 vs. y/d_2 vs. y/d_3.  Add/add/add is not
+#         representable in the index, so the existence of y/d_3 needs to
+#         cause us to bail on directory rename detection for that path, falling
+#         back to git behavior without the directory rename detection.
+
+test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflict' '
+	test_create_repo 5b &&
+	(
+		cd 5b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d1 >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/d &&
+		git mv z y &&
+		echo d2 >y/d &&
+		git add y/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		echo d3 >y/d &&
+		echo e >z/e &&
+		git add y/d z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '5b-check: Rename/delete in order to get add/add/add conflict' '
+	(
+		cd 5b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (add/add).* y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e :2:y/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e  A:y/d  B:y/d &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/d &&
+		test_path_is_file y/d
+	)
+'
+
+# Testcase 5c, Transitive rename would cause rename/rename/rename/add/add/add
+#   (Directory rename detection would result in transitive rename vs.
+#    rename/rename(1to2) and turn it into a rename/rename(1to3).  Further,
+#    rename paths conflict with separate adds on the other side)
+#   (Related to testcases 3b and 7c)
+#   Commit O: z/{b,c}, x/d_1
+#   Commit A: y/{b,c,d_2}, w/d_1
+#   Commit B: z/{b,c,d_1,e}, w/d_3, y/d_4
+#   Expected: A mess, but only a rename/rename(1to2)/add/add mess.  Use the
+#             presence of y/d_4 in B to avoid doing transitive rename of
+#             x/d_1 -> z/d_1 -> y/d_1, so that the only paths we have at
+#             y/d are y/d_2 and y/d_4.  We still do the move from z/e to y/e,
+#             though, because it doesn't have anything in the way.
+
+test_expect_success '5c-setup: Transitive rename would cause rename/rename/rename/add/add/add' '
+	test_create_repo 5c &&
+	(
+		cd 5c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d1 >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		echo d2 >y/d &&
+		git add y/d &&
+		git mv x w &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		mkdir w &&
+		mkdir y &&
+		echo d3 >w/d &&
+		echo d4 >y/d &&
+		echo e >z/e &&
+		git add w/ y/ z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '5c-check: Transitive rename would cause rename/rename/rename/add/add/add' '
+	(
+		cd 5c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
+		test_i18ngrep "CONFLICT (add/add).* y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 9 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/d &&
+		git rev-parse >actual \
+			:2:w/d :3:w/d :1:x/d :2:y/d :3:y/d :3:z/d &&
+		git rev-parse >expect \
+			 O:x/d  B:w/d  O:x/d  A:y/d  B:y/d  O:x/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			w/d~HEAD w/d~B^0 z/d &&
+		git rev-parse >expect \
+			O:x/d    B:w/d   O:x/d &&
+		test_cmp expect actual &&
+		test_path_is_missing x/d &&
+		test_path_is_file y/d &&
+		grep -q "<<<<" y/d  # conflict markers should be present
+	)
+'
+
+# Testcase 5d, Directory/file/file conflict due to directory rename
+#   Commit O: z/{b,c}
+#   Commit A: y/{b,c,d_1}
+#   Commit B: z/{b,c,d_2,f}, y/d/e
+#   Expected: y/{b,c,d/e,f}, z/d_2, CONFLICT(file/directory), y/d_1~HEAD
+#   Note: The fact that y/d/ exists in B makes us bail on directory rename
+#         detection for z/d_2, but that doesn't prevent us from applying the
+#         directory rename detection for z/f -> y/f.
+
+test_expect_success '5d-setup: Directory/file/file conflict due to directory rename' '
+	test_create_repo 5d &&
+	(
+		cd 5d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		echo d1 >y/d &&
+		git add y/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir -p y/d &&
+		echo e >y/d/e &&
+		echo d2 >z/d &&
+		echo f >z/f &&
+		git add y/d/e z/d z/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '5d-check: Directory/file/file conflict due to directory rename' '
+	(
+		cd 5d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (file/directory).*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
+		test_cmp expect actual &&
+
+		git hash-object y/d~HEAD >actual &&
+		git rev-parse A:y/d >expect &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# Rules suggested by section 5:
+#
+#   If a subset of to-be-renamed files have a file or directory in the way,
+#   "turn off" the directory rename for those specific sub-paths, falling
+#   back to old handling.  But, sadly, see testcases 8a and 8b.
+###########################################################################
+
+
+###########################################################################
+# SECTION 6: Same side of the merge was the one that did the rename
+#
+# It may sound obvious that you only want to apply implicit directory
+# renames to directories if the _other_ side of history did the renaming.
+# If you did make an implementation that didn't explicitly enforce this
+# rule, the majority of cases that would fall under this section would
+# also be solved by following the rules from the above sections.  But
+# there are still a few that stick out, so this section covers them just
+# to make sure we also get them right.
+###########################################################################
+
+# Testcase 6a, Tricky rename/delete
+#   Commit O: z/{b,c,d}
+#   Commit A: z/b
+#   Commit B: y/{b,c}, z/d
+#   Expected: y/b, CONFLICT(rename/delete, z/c -> y/c vs. NULL)
+#   Note: We're just checking here that the rename of z/b and z/c to put
+#         them under y/ doesn't accidentally catch z/d and make it look like
+#         it is also involved in a rename/delete conflict.
+
+test_expect_success '6a-setup: Tricky rename/delete' '
+	test_create_repo 6a &&
+	(
+		cd 6a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/c &&
+		git rm z/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '6a-check: Tricky rename/delete' '
+	(
+		cd 6a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :3:y/c &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 6b, Same rename done on both sides
+#   (Related to testcases 6c and 8e)
+#   Commit O: z/{b,c}
+#   Commit A: y/{b,c}
+#   Commit B: y/{b,c}, z/d
+#   Expected: y/{b,c}, z/d
+#   Note: If we did directory rename detection here, we'd move z/d into y/,
+#         but B did that rename and still decided to put the file into z/,
+#         so we probably shouldn't apply directory rename detection for it.
+
+test_expect_success '6b-setup: Same rename done on both sides' '
+	test_create_repo 6b &&
+	(
+		cd 6b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir z &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '6b-check: Same rename done on both sides' '
+	(
+		cd 6b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 6c, Rename only done on same side
+#   (Related to testcases 6b and 8e)
+#   Commit O: z/{b,c}
+#   Commit A: z/{b,c} (no change)
+#   Commit B: y/{b,c}, z/d
+#   Expected: y/{b,c}, z/d
+#   NOTE: Seems obvious, but just checking that the implementation doesn't
+#         "accidentally detect a rename" and give us y/{b,c,d}.
+
+test_expect_success '6c-setup: Rename only done on same side' '
+	test_create_repo 6c &&
+	(
+		cd 6c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir z &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '6c-check: Rename only done on same side' '
+	(
+		cd 6c &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 6d, We don't always want transitive renaming
+#   (Related to testcase 1c)
+#   Commit O: z/{b,c}, x/d
+#   Commit A: z/{b,c}, x/d (no change)
+#   Commit B: y/{b,c}, z/d
+#   Expected: y/{b,c}, z/d
+#   NOTE: Again, this seems obvious but just checking that the implementation
+#         doesn't "accidentally detect a rename" and give us y/{b,c,d}.
+
+test_expect_success '6d-setup: We do not always want transitive renaming' '
+	test_create_repo 6d &&
+	(
+		cd 6d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		git mv x z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '6d-check: We do not always want transitive renaming' '
+	(
+		cd 6d &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 6e, Add/add from one-side
+#   Commit O: z/{b,c}
+#   Commit A: z/{b,c} (no change)
+#   Commit B: y/{b,c,d_1}, z/d_2
+#   Expected: y/{b,c,d_1}, z/d_2
+#   NOTE: Again, this seems obvious but just checking that the implementation
+#         doesn't "accidentally detect a rename" and give us y/{b,c} +
+#         add/add conflict on y/d_1 vs y/d_2.
+
+test_expect_success '6e-setup: Add/add from one side' '
+	test_create_repo 6e &&
+	(
+		cd 6e &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		echo d1 > y/d &&
+		mkdir z &&
+		echo d2 > z/d &&
+		git add y/d z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '6e-check: Add/add from one side' '
+	(
+		cd 6e &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:y/d    B:z/d &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# Rules suggested by section 6:
+#
+#   Only apply implicit directory renames to directories if the other
+#   side of history is the one doing the renaming.
+###########################################################################
+
+
+###########################################################################
+# SECTION 7: More involved Edge/Corner cases
+#
+# The ruleset we have generated in the above sections seems to provide
+# well-defined merges.  But can we find edge/corner cases that either (a)
+# are harder for users to understand, or (b) have a resolution that is
+# non-intuitive or suboptimal?
+#
+# The testcases in this section dive into cases that I've tried to craft in
+# a way to find some that might be surprising to users or difficult for
+# them to understand (the next section will look at non-intuitive or
+# suboptimal merge results).  Some of the testcases are similar to ones
+# from past sections, but have been simplified to try to highlight error
+# messages using a "modified" path (due to the directory rename).  Are
+# users okay with these?
+#
+# In my opinion, testcases that are difficult to understand from this
+# section is due to difficulty in the testcase rather than the directory
+# renaming (similar to how t6042 and t6036 have difficult resolutions due
+# to the problem setup itself being complex).  And I don't think the
+# error messages are a problem.
+#
+# On the other hand, the testcases in section 8 worry me slightly more...
+###########################################################################
+
+# Testcase 7a, rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+#   Commit O: z/{b,c}
+#   Commit A: y/{b,c}
+#   Commit B: w/b, x/c, z/d
+#   Expected: y/d, CONFLICT(rename/rename for both z/b and z/c)
+#   NOTE: There's a rename of z/ here, y/ has more renames, so z/d -> y/d.
+
+test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+	test_create_repo 7a &&
+	(
+		cd 7a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir w &&
+		mkdir x &&
+		git mv z/b w/ &&
+		git mv z/c x/ &&
+		echo d > z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+	(
+		cd 7a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
+		test_i18ngrep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:x/c :0:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			y/b   w/b   y/c   x/c &&
+		git rev-parse >expect \
+			O:z/b O:z/b O:z/c O:z/c &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 7b, rename/rename(2to1), but only due to transitive rename
+#   (Related to testcase 1d)
+#   Commit O: z/{b,c},     x/d_1, w/d_2
+#   Commit A: y/{b,c,d_2}, x/d_1
+#   Commit B: z/{b,c,d_1},        w/d_2
+#   Expected: y/{b,c}, CONFLICT(rename/rename(2to1): x/d_1, w/d_2 -> y_d)
+
+test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive rename' '
+	test_create_repo 7b &&
+	(
+		cd 7b &&
+
+		mkdir z &&
+		mkdir x &&
+		mkdir w &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d1 > x/d &&
+		echo d2 > w/d &&
+		git add z x w &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git mv w/d y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '7b-check: rename/rename(2to1), but only due to transitive rename' '
+	(
+		cd 7b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :2:y/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:w/d  O:x/d &&
+		test_cmp expect actual &&
+
+		test_path_is_missing y/d &&
+		test_path_is_file y/d~HEAD &&
+		test_path_is_file y/d~B^0 &&
+
+		git hash-object >actual \
+			y/d~HEAD y/d~B^0 &&
+		git rev-parse >expect \
+			O:w/d    O:x/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 7c, rename/rename(1to...2or3); transitive rename may add complexity
+#   (Related to testcases 3b and 5c)
+#   Commit O: z/{b,c}, x/d
+#   Commit A: y/{b,c}, w/d
+#   Commit B: z/{b,c,d}
+#   Expected: y/{b,c}, CONFLICT(x/d -> w/d vs. y/d)
+#   NOTE: z/ was renamed to y/ so we do want to report
+#         neither CONFLICT(x/d -> w/d vs. z/d)
+#         nor CONFLiCT x/d -> w/d vs. y/d vs. z/d)
+
+test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may add complexity' '
+	test_create_repo 7c &&
+	(
+		cd 7c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git mv x w &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may add complexity' '
+	(
+		cd 7c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :1:x/d :2:w/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:x/d  O:x/d  O:x/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 7d, transitive rename involved in rename/delete; how is it reported?
+#   (Related somewhat to testcases 5b and 8d)
+#   Commit O: z/{b,c}, x/d
+#   Commit A: y/{b,c}
+#   Commit B: z/{b,c,d}
+#   Expected: y/{b,c}, CONFLICT(delete x/d vs rename to y/d)
+#   NOTE: z->y so NOT CONFLICT(delete x/d vs rename to z/d)
+
+test_expect_success '7d-setup: transitive rename involved in rename/delete; how is it reported?' '
+	test_create_repo 7d &&
+	(
+		cd 7d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git rm -rf x &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '7d-check: transitive rename involved in rename/delete; how is it reported?' '
+	(
+		cd 7d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:x/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 7e, transitive rename in rename/delete AND dirs in the way
+#   (Very similar to 'both rename source and destination involved in D/F conflict' from t6022-merge-rename.sh)
+#   (Also related to testcases 9c and 9d)
+#   Commit O: z/{b,c},     x/d_1
+#   Commit A: y/{b,c,d/g}, x/d/f
+#   Commit B: z/{b,c,d_1}
+#   Expected: rename/delete(x/d_1->y/d_1 vs. None) + D/F conflict on y/d
+#             y/{b,c,d/g}, y/d_1~B^0, x/d/f
+
+#   NOTE: The main path of interest here is d_1 and where it ends up, but
+#         this is actually a case that has two potential directory renames
+#         involved and D/F conflict(s), so it makes sense to walk through
+#         each step.
+#
+#         Commit A renames z/ -> y/.  Thus everything that B adds to z/
+#         should be instead moved to y/.  This gives us the D/F conflict on
+#         y/d because x/d_1 -> z/d_1 -> y/d_1 conflicts with y/d/g.
+#
+#         Further, commit B renames x/ -> z/, thus everything A adds to x/
+#         should instead be moved to z/...BUT we removed z/ and renamed it
+#         to y/, so maybe everything should move not from x/ to z/, but
+#         from x/ to z/ to y/.  Doing so might make sense from the logic so
+#         far, but note that commit A had both an x/ and a y/; it did the
+#         renaming of z/ to y/ and created x/d/f and it clearly made these
+#         things separate, so it doesn't make much sense to push these
+#         together.  Doing so is what I'd call a doubly transitive rename;
+#         see testcases 9c and 9d for further discussion of this issue and
+#         how it's resolved.
+
+test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in the way' '
+	test_create_repo 7e &&
+	(
+		cd 7e &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d1 >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git rm x/d &&
+		mkdir -p x/d &&
+		mkdir -p y/d &&
+		echo f >x/d/f &&
+		echo g >y/d/g &&
+		git add x/d/f y/d/g &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '7e-check: transitive rename in rename/delete AND dirs in the way' '
+	(
+		cd 7e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
+		git rev-parse >expect \
+			 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d &&
+		test_cmp expect actual &&
+
+		git hash-object y/d~B^0 >actual &&
+		git rev-parse O:x/d >expect &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# SECTION 8: Suboptimal merges
+#
+# As alluded to in the last section, the ruleset we have built up for
+# detecting directory renames unfortunately has some special cases where it
+# results in slightly suboptimal or non-intuitive behavior.  This section
+# explores these cases.
+#
+# To be fair, we already had non-intuitive or suboptimal behavior for most
+# of these cases in git before introducing implicit directory rename
+# detection, but it'd be nice if there was a modified ruleset out there
+# that handled these cases a bit better.
+###########################################################################
+
+# Testcase 8a, Dual-directory rename, one into the others' way
+#   Commit O. x/{a,b},   y/{c,d}
+#   Commit A. x/{a,b,e}, y/{c,d,f}
+#   Commit B. y/{a,b},   z/{c,d}
+#
+# Possible Resolutions:
+#   w/o dir-rename detection: y/{a,b,f},   z/{c,d},   x/e
+#   Currently expected:       y/{a,b,e,f}, z/{c,d}
+#   Optimal:                  y/{a,b,e},   z/{c,d,f}
+#
+# Note: Both x and y got renamed and it'd be nice to detect both, and we do
+# better with directory rename detection than git did without, but the
+# simple rule from section 5 prevents me from handling this as optimally as
+# we potentially could.
+
+test_expect_success '8a-setup: Dual-directory rename, one into the others way' '
+	test_create_repo 8a &&
+	(
+		cd 8a &&
+
+		mkdir x &&
+		mkdir y &&
+		echo a >x/a &&
+		echo b >x/b &&
+		echo c >y/c &&
+		echo d >y/d &&
+		git add x y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e >x/e &&
+		echo f >y/f &&
+		git add x/e y/f &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv y z &&
+		git mv x y &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '8a-check: Dual-directory rename, one into the others way' '
+	(
+		cd 8a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/a HEAD:y/b HEAD:y/e HEAD:y/f HEAD:z/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:x/a    O:x/b    A:x/e    A:y/f    O:y/c    O:y/d &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 8b, Dual-directory rename, one into the others' way, with conflicting filenames
+#   Commit O. x/{a_1,b_1},     y/{a_2,b_2}
+#   Commit A. x/{a_1,b_1,e_1}, y/{a_2,b_2,e_2}
+#   Commit B. y/{a_1,b_1},     z/{a_2,b_2}
+#
+#   w/o dir-rename detection: y/{a_1,b_1,e_2}, z/{a_2,b_2}, x/e_1
+#   Currently expected:       <same>
+#   Scary:                    y/{a_1,b_1},     z/{a_2,b_2}, CONFLICT(add/add, e_1 vs. e_2)
+#   Optimal:                  y/{a_1,b_1,e_1}, z/{a_2,b_2,e_2}
+#
+# Note: Very similar to 8a, except instead of 'e' and 'f' in directories x and
+# y, both are named 'e'.  Without directory rename detection, neither file
+# moves directories.  Implement directory rename detection suboptimally, and
+# you get an add/add conflict, but both files were added in commit A, so this
+# is an add/add conflict where one side of history added both files --
+# something we can't represent in the index.  Obviously, we'd prefer the last
+# resolution, but our previous rules are too coarse to allow it.  Using both
+# the rules from section 4 and section 5 save us from the Scary resolution,
+# making us fall back to pre-directory-rename-detection behavior for both
+# e_1 and e_2.
+
+test_expect_success '8b-setup: Dual-directory rename, one into the others way, with conflicting filenames' '
+	test_create_repo 8b &&
+	(
+		cd 8b &&
+
+		mkdir x &&
+		mkdir y &&
+		echo a1 >x/a &&
+		echo b1 >x/b &&
+		echo a2 >y/a &&
+		echo b2 >y/b &&
+		git add x y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e1 >x/e &&
+		echo e2 >y/e &&
+		git add x/e y/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv y z &&
+		git mv x y &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '8b-check: Dual-directory rename, one into the others way, with conflicting filenames' '
+	(
+		cd 8b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/a HEAD:y/b HEAD:z/a HEAD:z/b HEAD:x/e HEAD:y/e &&
+		git rev-parse >expect \
+			O:x/a    O:x/b    O:y/a    O:y/b    A:x/e    A:y/e &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 8c, modify/delete or rename+modify/delete?
+#   (Related to testcases 5b, 8d, and 9h)
+#   Commit O: z/{b,c,d}
+#   Commit A: y/{b,c}
+#   Commit B: z/{b,c,d_modified,e}
+#   Expected: y/{b,c,e}, CONFLICT(modify/delete: on z/d)
+#
+#   Note: It could easily be argued that the correct resolution here is
+#         y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted)
+#         and that the modifed version of d should be present in y/ after
+#         the merge, just marked as conflicted.  Indeed, I previously did
+#         argue that.  But applying directory renames to the side of
+#         history where a file is merely modified results in spurious
+#         rename/rename(1to2) conflicts -- see testcase 9h.  See also
+#         notes in 8d.
+
+test_expect_success '8c-setup: modify/delete or rename+modify/delete?' '
+	test_create_repo 8c &&
+	(
+		cd 8c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		test_seq 1 10 >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/d &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo 11 >z/d &&
+		test_chmod +x z/d &&
+		echo e >z/e &&
+		git add z/d z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '8c-check: modify/delete or rename+modify/delete' '
+	(
+		cd 8c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (modify/delete).* z/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e :1:z/d :3:z/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e  O:z/d  B:z/d &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :2:z/d &&
+		git ls-files -s z/d | grep ^100755 &&
+		test_path_is_file z/d &&
+		test_path_is_missing y/d
+	)
+'
+
+# Testcase 8d, rename/delete...or not?
+#   (Related to testcase 5b; these may appear slightly inconsistent to users;
+#    Also related to testcases 7d and 7e)
+#   Commit O: z/{b,c,d}
+#   Commit A: y/{b,c}
+#   Commit B: z/{b,c,d,e}
+#   Expected: y/{b,c,e}
+#
+#   Note: It would also be somewhat reasonable to resolve this as
+#             y/{b,c,e}, CONFLICT(rename/delete: x/d -> y/d or deleted)
+#
+#   In this case, I'm leaning towards: commit A was the one that deleted z/d
+#   and it did the rename of z to y, so the two "conflicts" (rename vs.
+#   delete) are both coming from commit A, which is illogical.  Conflicts
+#   during merging are supposed to be about opposite sides doing things
+#   differently.
+
+test_expect_success '8d-setup: rename/delete...or not?' '
+	test_create_repo 8d &&
+	(
+		cd 8d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		test_seq 1 10 >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/d &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo e >z/e &&
+		git add z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '8d-check: rename/delete...or not?' '
+	(
+		cd 8d &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/e &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/e &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 8e, Both sides rename, one side adds to original directory
+#   Commit O: z/{b,c}
+#   Commit A: y/{b,c}
+#   Commit B: w/{b,c}, z/d
+#
+# Possible Resolutions:
+#   w/o dir-rename detection: z/d, CONFLICT(z/b -> y/b vs. w/b),
+#                                  CONFLICT(z/c -> y/c vs. w/c)
+#   Currently expected:       y/d, CONFLICT(z/b -> y/b vs. w/b),
+#                                  CONFLICT(z/c -> y/c vs. w/c)
+#   Optimal:                  ??
+#
+# Notes: In commit A, directory z got renamed to y.  In commit B, directory z
+#        did NOT get renamed; the directory is still present; instead it is
+#        considered to have just renamed a subset of paths in directory z
+#        elsewhere.  Therefore, the directory rename done in commit A to z/
+#        applies to z/d and maps it to y/d.
+#
+#        It's possible that users would get confused about this, but what
+#        should we do instead?  Silently leaving at z/d seems just as bad or
+#        maybe even worse.  Perhaps we could print a big warning about z/d
+#        and how we're moving to y/d in this case, but when I started thinking
+#        about the ramifications of doing that, I didn't know how to rule out
+#        that opening other weird edge and corner cases so I just punted.
+
+test_expect_success '8e-setup: Both sides rename, one side adds to original directory' '
+	test_create_repo 8e &&
+	(
+		cd 8e &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z w &&
+		mkdir z &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '8e-check: Both sides rename, one side adds to original directory' '
+	(
+		cd 8e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
+		test_i18ngrep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:w/c :0:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			y/b   w/b   y/c   w/c &&
+		git rev-parse >expect \
+			O:z/b O:z/b O:z/c O:z/c &&
+		test_cmp expect actual &&
+
+		test_path_is_missing z/b &&
+		test_path_is_missing z/c
+	)
+'
+
+###########################################################################
+# SECTION 9: Other testcases
+#
+# This section consists of miscellaneous testcases I thought of during
+# the implementation which round out the testing.
+###########################################################################
+
+# Testcase 9a, Inner renamed directory within outer renamed directory
+#   (Related to testcase 1f)
+#   Commit O: z/{b,c,d/{e,f,g}}
+#   Commit A: y/{b,c}, x/w/{e,f,g}
+#   Commit B: z/{b,c,d/{e,f,g,h},i}
+#   Expected: y/{b,c,i}, x/w/{e,f,g,h}
+#   NOTE: The only reason this one is interesting is because when a directory
+#         is split into multiple other directories, we determine by the weight
+#         of which one had the most paths going to it.  A naive implementation
+#         of that could take the new file in commit B at z/i to x/w/i or x/i.
+
+test_expect_success '9a-setup: Inner renamed directory within outer renamed directory' '
+	test_create_repo 9a &&
+	(
+		cd 9a &&
+
+		mkdir -p z/d &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo e >z/d/e &&
+		echo f >z/d/f &&
+		echo g >z/d/g &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir x &&
+		git mv z/d x/w &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo h >z/d/h &&
+		echo i >z/i &&
+		git add z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '9a-check: Inner renamed directory within outer renamed directory' '
+	(
+		cd 9a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/i &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/i &&
+		test_cmp expect actual &&
+
+		git rev-parse >actual \
+			HEAD:x/w/e HEAD:x/w/f HEAD:x/w/g HEAD:x/w/h &&
+		git rev-parse >expect \
+			O:z/d/e    O:z/d/f    O:z/d/g    B:z/d/h &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 9b, Transitive rename with content merge
+#   (Related to testcase 1c)
+#   Commit O: z/{b,c},   x/d_1
+#   Commit A: y/{b,c},   x/d_2
+#   Commit B: z/{b,c,d_3}
+#   Expected: y/{b,c,d_merged}
+
+test_expect_success '9b-setup: Transitive rename with content merge' '
+	test_create_repo 9b &&
+	(
+		cd 9b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		test_seq 1 10 >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_seq 1 11 >x/d &&
+		git add x/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_seq 0 10 >x/d &&
+		git mv x/d z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '9b-check: Transitive rename with content merge' '
+	(
+		cd 9b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		test_seq 0 11 >expected &&
+		test_cmp expected y/d &&
+		git add expected &&
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    :0:expected &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:x/d &&
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_path_is_missing z/d &&
+
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse O:x/d) &&
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse A:x/d) &&
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse B:z/d)
+	)
+'
+
+# Testcase 9c, Doubly transitive rename?
+#   (Related to testcase 1c, 7e, and 9d)
+#   Commit O: z/{b,c},     x/{d,e},    w/f
+#   Commit A: y/{b,c},     x/{d,e,f,g}
+#   Commit B: z/{b,c,d,e},             w/f
+#   Expected: y/{b,c,d,e}, x/{f,g}
+#
+#   NOTE: x/f and x/g may be slightly confusing here.  The rename from w/f to
+#         x/f is clear.  Let's look beyond that.  Here's the logic:
+#            Commit B renamed x/ -> z/
+#            Commit A renamed z/ -> y/
+#         So, we could possibly further rename x/f to z/f to y/f, a doubly
+#         transient rename.  However, where does it end?  We can chain these
+#         indefinitely (see testcase 9d).  What if there is a D/F conflict
+#         at z/f/ or y/f/?  Or just another file conflict at one of those
+#         paths?  In the case of an N-long chain of transient renamings,
+#         where do we "abort" the rename at?  Can the user make sense of
+#         the resulting conflict and resolve it?
+#
+#         To avoid this confusion I use the simple rule that if the other side
+#         of history did a directory rename to a path that your side renamed
+#         away, then ignore that particular rename from the other side of
+#         history for any implicit directory renames.
+
+test_expect_success '9c-setup: Doubly transitive rename?' '
+	test_create_repo 9c &&
+	(
+		cd 9c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		echo e >x/e &&
+		mkdir w &&
+		echo f >w/f &&
+		git add z x w &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git mv w/f x/ &&
+		echo g >x/g &&
+		git add x/g &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/d &&
+		git mv x/e z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '9c-check: Doubly transitive rename?' '
+	(
+		cd 9c &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 >out &&
+		test_i18ngrep "WARNING: Avoiding applying x -> z rename to x/f" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e HEAD:x/f HEAD:x/g &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d    O:x/e    O:w/f    A:x/g &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 9d, N-fold transitive rename?
+#   (Related to testcase 9c...and 1c and 7e)
+#   Commit O: z/a, y/b, x/c, w/d, v/e, u/f
+#   Commit A:  y/{a,b},  w/{c,d},  u/{e,f}
+#   Commit B: z/{a,t}, x/{b,c}, v/{d,e}, u/f
+#   Expected: <see NOTE first>
+#
+#   NOTE: z/ -> y/ (in commit A)
+#         y/ -> x/ (in commit B)
+#         x/ -> w/ (in commit A)
+#         w/ -> v/ (in commit B)
+#         v/ -> u/ (in commit A)
+#         So, if we add a file to z, say z/t, where should it end up?  In u?
+#         What if there's another file or directory named 't' in one of the
+#         intervening directories and/or in u itself?  Also, shouldn't the
+#         same logic that places 't' in u/ also move ALL other files to u/?
+#         What if there are file or directory conflicts in any of them?  If
+#         we attempted to do N-way (N-fold? N-ary? N-uple?) transitive renames
+#         like this, would the user have any hope of understanding any
+#         conflicts or how their working tree ended up?  I think not, so I'm
+#         ruling out N-ary transitive renames for N>1.
+#
+#   Therefore our expected result is:
+#     z/t, y/a, x/b, w/c, u/d, u/e, u/f
+#   The reason that v/d DOES get transitively renamed to u/d is that u/ isn't
+#   renamed somewhere.  A slightly sub-optimal result, but it uses fairly
+#   simple rules that are consistent with what we need for all the other
+#   testcases and simplifies things for the user.
+
+test_expect_success '9d-setup: N-way transitive rename?' '
+	test_create_repo 9d &&
+	(
+		cd 9d &&
+
+		mkdir z y x w v u &&
+		echo a >z/a &&
+		echo b >y/b &&
+		echo c >x/c &&
+		echo d >w/d &&
+		echo e >v/e &&
+		echo f >u/f &&
+		git add z y x w v u &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z/a y/ &&
+		git mv x/c w/ &&
+		git mv v/e u/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo t >z/t &&
+		git mv y/b x/ &&
+		git mv w/d v/ &&
+		git add z/t &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '9d-check: N-way transitive rename?' '
+	(
+		cd 9d &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 >out &&
+		test_i18ngrep "WARNING: Avoiding applying z -> y rename to z/t" out &&
+		test_i18ngrep "WARNING: Avoiding applying y -> x rename to y/a" out &&
+		test_i18ngrep "WARNING: Avoiding applying x -> w rename to x/b" out &&
+		test_i18ngrep "WARNING: Avoiding applying w -> v rename to w/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:z/t \
+			HEAD:y/a HEAD:x/b HEAD:w/c \
+			HEAD:u/d HEAD:u/e HEAD:u/f &&
+		git rev-parse >expect \
+			B:z/t    \
+			O:z/a    O:y/b    O:x/c    \
+			O:w/d    O:v/e    A:u/f &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 9e, N-to-1 whammo
+#   (Related to testcase 9c...and 1c and 7e)
+#   Commit O: dir1/{a,b}, dir2/{d,e}, dir3/{g,h}, dirN/{j,k}
+#   Commit A: dir1/{a,b,c,yo}, dir2/{d,e,f,yo}, dir3/{g,h,i,yo}, dirN/{j,k,l,yo}
+#   Commit B: combined/{a,b,d,e,g,h,j,k}
+#   Expected: combined/{a,b,c,d,e,f,g,h,i,j,k,l}, CONFLICT(Nto1) warnings,
+#             dir1/yo, dir2/yo, dir3/yo, dirN/yo
+
+test_expect_success '9e-setup: N-to-1 whammo' '
+	test_create_repo 9e &&
+	(
+		cd 9e &&
+
+		mkdir dir1 dir2 dir3 dirN &&
+		echo a >dir1/a &&
+		echo b >dir1/b &&
+		echo d >dir2/d &&
+		echo e >dir2/e &&
+		echo g >dir3/g &&
+		echo h >dir3/h &&
+		echo j >dirN/j &&
+		echo k >dirN/k &&
+		git add dir* &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo c  >dir1/c &&
+		echo yo >dir1/yo &&
+		echo f  >dir2/f &&
+		echo yo >dir2/yo &&
+		echo i  >dir3/i &&
+		echo yo >dir3/yo &&
+		echo l  >dirN/l &&
+		echo yo >dirN/yo &&
+		git add dir* &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv dir1 combined &&
+		git mv dir2/* combined/ &&
+		git mv dir3/* combined/ &&
+		git mv dirN/* combined/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' '
+	(
+		cd 9e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		grep "CONFLICT (implicit dir rename): Cannot map more than one path to combined/yo" out >error_line &&
+		grep -q dir1/yo error_line &&
+		grep -q dir2/yo error_line &&
+		grep -q dir3/yo error_line &&
+		grep -q dirN/yo error_line &&
+
+		git ls-files -s >out &&
+		test_line_count = 16 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:0:combined/a :0:combined/b :0:combined/c \
+			:0:combined/d :0:combined/e :0:combined/f \
+			:0:combined/g :0:combined/h :0:combined/i \
+			:0:combined/j :0:combined/k :0:combined/l &&
+		git rev-parse >expect \
+			 O:dir1/a      O:dir1/b      A:dir1/c \
+			 O:dir2/d      O:dir2/e      A:dir2/f \
+			 O:dir3/g      O:dir3/h      A:dir3/i \
+			 O:dirN/j      O:dirN/k      A:dirN/l &&
+		test_cmp expect actual &&
+
+		git rev-parse >actual \
+			:0:dir1/yo :0:dir2/yo :0:dir3/yo :0:dirN/yo &&
+		git rev-parse >expect \
+			 A:dir1/yo  A:dir2/yo  A:dir3/yo  A:dirN/yo &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 9f, Renamed directory that only contained immediate subdirs
+#   (Related to testcases 1e & 9g)
+#   Commit O: goal/{a,b}/$more_files
+#   Commit A: priority/{a,b}/$more_files
+#   Commit B: goal/{a,b}/$more_files, goal/c
+#   Expected: priority/{a,b}/$more_files, priority/c
+
+test_expect_success '9f-setup: Renamed directory that only contained immediate subdirs' '
+	test_create_repo 9f &&
+	(
+		cd 9f &&
+
+		mkdir -p goal/a &&
+		mkdir -p goal/b &&
+		echo foo >goal/a/foo &&
+		echo bar >goal/b/bar &&
+		echo baz >goal/b/baz &&
+		git add goal &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv goal/ priority &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo c >goal/c &&
+		git add goal/c &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '9f-check: Renamed directory that only contained immediate subdirs' '
+	(
+		cd 9f &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:priority/a/foo \
+			HEAD:priority/b/bar \
+			HEAD:priority/b/baz \
+			HEAD:priority/c &&
+		git rev-parse >expect \
+			O:goal/a/foo \
+			O:goal/b/bar \
+			O:goal/b/baz \
+			B:goal/c &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:goal/c
+	)
+'
+
+# Testcase 9g, Renamed directory that only contained immediate subdirs, immediate subdirs renamed
+#   (Related to testcases 1e & 9f)
+#   Commit O: goal/{a,b}/$more_files
+#   Commit A: priority/{alpha,bravo}/$more_files
+#   Commit B: goal/{a,b}/$more_files, goal/c
+#   Expected: priority/{alpha,bravo}/$more_files, priority/c
+
+test_expect_success '9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+	test_create_repo 9g &&
+	(
+		cd 9g &&
+
+		mkdir -p goal/a &&
+		mkdir -p goal/b &&
+		echo foo >goal/a/foo &&
+		echo bar >goal/b/bar &&
+		echo baz >goal/b/baz &&
+		git add goal &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir priority &&
+		git mv goal/a/ priority/alpha &&
+		git mv goal/b/ priority/beta &&
+		rmdir goal/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo c >goal/c &&
+		git add goal/c &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_failure '9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+	(
+		cd 9g &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:priority/alpha/foo \
+			HEAD:priority/beta/bar  \
+			HEAD:priority/beta/baz  \
+			HEAD:priority/c &&
+		git rev-parse >expect \
+			O:goal/a/foo \
+			O:goal/b/bar \
+			O:goal/b/baz \
+			B:goal/c &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:goal/c
+	)
+'
+
+# Testcase 9h, Avoid implicit rename if involved as source on other side
+#   (Extremely closely related to testcase 3a)
+#   Commit O: z/{b,c,d_1}
+#   Commit A: z/{b,c,d_2}
+#   Commit B: y/{b,c}, x/d_1
+#   Expected: y/{b,c}, x/d_2
+#   NOTE: If we applied the z/ -> y/ rename to z/d, then we'd end up with
+#         a rename/rename(1to2) conflict (z/d -> y/d vs. x/d)
+test_expect_success '9h-setup: Avoid dir rename on merely modified path' '
+	test_create_repo 9h &&
+	(
+		cd 9h &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nd\n" >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		echo more >>z/d &&
+		git add z/d &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '9h-check: Avoid dir rename on merely modified path' '
+	(
+		cd 9h &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    A:z/d &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# Rules suggested by section 9:
+#
+#   If the other side of history did a directory rename to a path that your
+#   side renamed away, then ignore that particular rename from the other
+#   side of history for any implicit directory renames.
+###########################################################################
+
+###########################################################################
+# SECTION 10: Handling untracked files
+#
+# unpack_trees(), upon which the recursive merge algorithm is based, aborts
+# the operation if untracked or dirty files would be deleted or overwritten
+# by the merge.  Unfortunately, unpack_trees() does not understand renames,
+# and if it doesn't abort, then it muddies up the working directory before
+# we even get to the point of detecting renames, so we need some special
+# handling, at least in the case of directory renames.
+###########################################################################
+
+# Testcase 10a, Overwrite untracked: normal rename/delete
+#   Commit O: z/{b,c_1}
+#   Commit A: z/b + untracked z/c + untracked z/d
+#   Commit B: z/{b,d_1}
+#   Expected: Aborted Merge +
+#       ERROR_MSG(untracked working tree files would be overwritten by merge)
+
+test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' '
+	test_create_repo 10a &&
+	(
+		cd 10a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z/c z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
+	(
+		cd 10a &&
+
+		git checkout A^0 &&
+		echo very >z/c &&
+		echo important >z/d &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
+
+		git ls-files -s >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		echo very >expect &&
+		test_cmp expect z/c &&
+
+		echo important >expect &&
+		test_cmp expect z/d &&
+
+		git rev-parse HEAD:z/b >actual &&
+		git rev-parse O:z/b >expect &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 10b, Overwrite untracked: dir rename + delete
+#   Commit O: z/{b,c_1}
+#   Commit A: y/b + untracked y/{c,d,e}
+#   Commit B: z/{b,d_1,e}
+#   Expected: Failed Merge; y/b + untracked y/c + untracked y/d on disk +
+#             z/c_1 -> z/d_1 rename recorded at stage 3 for y/d +
+#       ERROR_MSG(refusing to lose untracked file at 'y/d')
+
+test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' '
+	test_create_repo 10b &&
+	(
+		cd 10b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/c &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z/c z/d &&
+		echo e >z/e &&
+		git add z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '10b-check: Overwrite untracked with dir rename + delete' '
+	(
+		cd 10b &&
+
+		git checkout A^0 &&
+		echo very >y/c &&
+		echo important >y/d &&
+		echo contents >y/e &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
+		test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 5 out &&
+
+		git rev-parse >actual \
+			:0:y/b :3:y/d :3:y/e &&
+		git rev-parse >expect \
+			O:z/b  O:z/c  B:z/e &&
+		test_cmp expect actual &&
+
+		echo very >expect &&
+		test_cmp expect y/c &&
+
+		echo important >expect &&
+		test_cmp expect y/d &&
+
+		echo contents >expect &&
+		test_cmp expect y/e
+	)
+'
+
+# Testcase 10c, Overwrite untracked: dir rename/rename(1to2)
+#   Commit O: z/{a,b}, x/{c,d}
+#   Commit A: y/{a,b}, w/c, x/d + different untracked y/c
+#   Commit B: z/{a,b,c}, x/d
+#   Expected: Failed Merge; y/{a,b} + x/d + untracked y/c +
+#             CONFLICT(rename/rename) x/c -> w/c vs y/c +
+#             y/c~B^0 +
+#             ERROR_MSG(Refusing to lose untracked file at y/c)
+
+test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' '
+	test_create_repo 10c &&
+	(
+		cd 10c &&
+
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		echo c >x/c &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir w &&
+		git mv x/c w/c &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/c z/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)' '
+	(
+		cd 10c &&
+
+		git checkout A^0 &&
+		echo important >y/c &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
+		test_cmp expect actual &&
+
+		git hash-object y/c~B^0 >actual &&
+		git rev-parse O:x/c >expect &&
+		test_cmp expect actual &&
+
+		echo important >expect &&
+		test_cmp expect y/c
+	)
+'
+
+# Testcase 10d, Delete untracked w/ dir rename/rename(2to1)
+#   Commit O: z/{a,b,c_1},        x/{d,e,f_2}
+#   Commit A: y/{a,b},            x/{d,e,f_2,wham_1} + untracked y/wham
+#   Commit B: z/{a,b,c_1,wham_2}, y/{d,e}
+#   Expected: Failed Merge; y/{a,b,d,e} + untracked y/{wham,wham~B^0,wham~HEAD}+
+#             CONFLICT(rename/rename) z/c_1 vs x/f_2 -> y/wham
+#             ERROR_MSG(Refusing to lose untracked file at y/wham)
+
+test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' '
+	test_create_repo 10d &&
+	(
+		cd 10d &&
+
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >x/d &&
+		echo e >x/e &&
+		echo f >x/f &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z/c x/wham &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/f z/wham &&
+		git mv x/ y/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' '
+	(
+		cd 10d &&
+
+		git checkout A^0 &&
+		echo important >y/wham &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/wham &&
+
+		echo important >expect &&
+		test_cmp expect y/wham &&
+
+		git hash-object >actual \
+			y/wham~B^0 y/wham~HEAD &&
+		git rev-parse >expect \
+			O:x/f      O:z/c &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 10e, Does git complain about untracked file that's not in the way?
+#   Commit O: z/{a,b}
+#   Commit A: y/{a,b} + untracked z/c
+#   Commit B: z/{a,b,c}
+#   Expected: y/{a,b,c} + untracked z/c
+
+test_expect_success '10e-setup: Does git complain about untracked file that is not really in the way?' '
+	test_create_repo 10e &&
+	(
+		cd 10e &&
+
+		mkdir z &&
+		echo a >z/a &&
+		echo b >z/b &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo c >z/c &&
+		git add z/c &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' '
+	(
+		cd 10e &&
+
+		git checkout A^0 &&
+		mkdir z &&
+		echo random >z/c &&
+
+		git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep ! "following untracked working tree files would be overwritten by merge" err &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  B:z/c &&
+		test_cmp expect actual &&
+
+		echo random >expect &&
+		test_cmp expect z/c
+	)
+'
+
+###########################################################################
+# SECTION 11: Handling dirty (not up-to-date) files
+#
+# unpack_trees(), upon which the recursive merge algorithm is based, aborts
+# the operation if untracked or dirty files would be deleted or overwritten
+# by the merge.  Unfortunately, unpack_trees() does not understand renames,
+# and if it doesn't abort, then it muddies up the working directory before
+# we even get to the point of detecting renames, so we need some special
+# handling.  This was true even of normal renames, but there are additional
+# codepaths that need special handling with directory renames.  Add
+# testcases for both renamed-by-directory-rename-detection and standard
+# rename cases.
+###########################################################################
+
+# Testcase 11a, Avoid losing dirty contents with simple rename
+#   Commit O: z/{a,b_v1},
+#   Commit A: z/{a,c_v1}, and z/c_v1 has uncommitted mods
+#   Commit B: z/{a,b_v2}
+#   Expected: ERROR_MSG(Refusing to lose dirty file at z/c) +
+#             z/a, staged version of z/c has sha1sum matching B:z/b_v2,
+#             z/c~HEAD with contents of B:z/b_v2,
+#             z/c with uncommitted mods on top of A:z/c_v1
+
+test_expect_success '11a-setup: Avoid losing dirty contents with simple rename' '
+	test_create_repo 11a &&
+	(
+		cd 11a &&
+
+		mkdir z &&
+		echo a >z/a &&
+		test_seq 1 10 >z/b &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z/b z/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo 11 >>z/b &&
+		git add z/b &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '11a-check: Avoid losing dirty contents with simple rename' '
+	(
+		cd 11a &&
+
+		git checkout A^0 &&
+		echo stuff >>z/c &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			:0:z/a :2:z/c &&
+		git rev-parse >expect \
+			 O:z/a  B:z/b &&
+		test_cmp expect actual &&
+
+		git hash-object z/c~HEAD >actual &&
+		git rev-parse B:z/b >expect &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 11b, Avoid losing dirty file involved in directory rename
+#   Commit O: z/a,         x/{b,c_v1}
+#   Commit A: z/{a,c_v1},  x/b,       and z/c_v1 has uncommitted mods
+#   Commit B: y/a,         x/{b,c_v2}
+#   Expected: y/{a,c_v2}, x/b, z/c_v1 with uncommitted mods untracked,
+#             ERROR_MSG(Refusing to lose dirty file at z/c)
+
+
+test_expect_success '11b-setup: Avoid losing dirty file involved in directory rename' '
+	test_create_repo 11b &&
+	(
+		cd 11b &&
+
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >x/b &&
+		test_seq 1 10 >x/c &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv x/c z/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		echo 11 >>x/c &&
+		git add x/c &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '11b-check: Avoid losing dirty file involved in directory rename' '
+	(
+		cd 11b &&
+
+		git checkout A^0 &&
+		echo stuff >>z/c &&
+
+		git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+		grep -q stuff z/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -m >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			:0:x/b :0:y/a :0:y/c &&
+		git rev-parse >expect \
+			 O:x/b  O:z/a  B:x/c &&
+		test_cmp expect actual &&
+
+		git hash-object y/c >actual &&
+		git rev-parse B:x/c >expect &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 11c, Avoid losing not-up-to-date with rename + D/F conflict
+#   Commit O: y/a,         x/{b,c_v1}
+#   Commit A: y/{a,c_v1},  x/b,       and y/c_v1 has uncommitted mods
+#   Commit B: y/{a,c/d},   x/{b,c_v2}
+#   Expected: Abort_msg("following files would be overwritten by merge") +
+#             y/c left untouched (still has uncommitted mods)
+
+test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conflict' '
+	test_create_repo 11c &&
+	(
+		cd 11c &&
+
+		mkdir y x &&
+		echo a >y/a &&
+		echo b >x/b &&
+		test_seq 1 10 >x/c &&
+		git add y x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv x/c y/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y/c &&
+		echo d >y/c/d &&
+		echo 11 >>x/c &&
+		git add x/c y/c/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conflict' '
+	(
+		cd 11c &&
+
+		git checkout A^0 &&
+		echo stuff >>y/c &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "following files would be overwritten by merge" err &&
+
+		grep -q stuff y/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected y/c &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -m >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out
+	)
+'
+
+# Testcase 11d, Avoid losing not-up-to-date with rename + D/F conflict
+#   Commit O: z/a,         x/{b,c_v1}
+#   Commit A: z/{a,c_v1},  x/b,       and z/c_v1 has uncommitted mods
+#   Commit B: y/{a,c/d},   x/{b,c_v2}
+#   Expected: D/F: y/c_v2 vs y/c/d) +
+#             Warning_Msg("Refusing to lose dirty file at z/c) +
+#             y/{a,c~HEAD,c/d}, x/b, now-untracked z/c_v1 with uncommitted mods
+
+test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conflict' '
+	test_create_repo 11d &&
+	(
+		cd 11d &&
+
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >x/b &&
+		test_seq 1 10 >x/c &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv x/c z/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir y/c &&
+		echo d >y/c/d &&
+		echo 11 >>x/c &&
+		git add x/c y/c/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conflict' '
+	(
+		cd 11d &&
+
+		git checkout A^0 &&
+		echo stuff >>z/c &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+		grep -q stuff z/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 5 out &&
+
+		git rev-parse >actual \
+			:0:x/b :0:y/a :0:y/c/d :3:y/c &&
+		git rev-parse >expect \
+			 O:x/b  O:z/a  B:y/c/d  B:x/c &&
+		test_cmp expect actual &&
+
+		git hash-object y/c~HEAD >actual &&
+		git rev-parse B:x/c >expect &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 11e, Avoid deleting not-up-to-date with dir rename/rename(1to2)/add
+#   Commit O: z/{a,b},      x/{c_1,d}
+#   Commit A: y/{a,b,c_2},  x/d, w/c_1, and y/c_2 has uncommitted mods
+#   Commit B: z/{a,b,c_1},  x/d
+#   Expected: Failed Merge; y/{a,b} + x/d +
+#             CONFLICT(rename/rename) x/c_1 -> w/c_1 vs y/c_1 +
+#             ERROR_MSG(Refusing to lose dirty file at y/c)
+#             y/c~B^0 has O:x/c_1 contents
+#             y/c~HEAD has A:y/c_2 contents
+#             y/c has dirty file from before merge
+
+test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+	test_create_repo 11e &&
+	(
+		cd 11e &&
+
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		echo c >x/c &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z/ y/ &&
+		echo different >y/c &&
+		mkdir w &&
+		git mv x/c w/ &&
+		git add y/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/c z/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+	(
+		cd 11e &&
+
+		git checkout A^0 &&
+		echo mods >>y/c &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose dirty file at y/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 4 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		echo different >expected &&
+		echo mods >>expected &&
+		test_cmp expected y/c &&
+
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			y/c~B^0 y/c~HEAD &&
+		git rev-parse >expect \
+			O:x/c   A:y/c &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 11f, Avoid deleting not-up-to-date w/ dir rename/rename(2to1)
+#   Commit O: z/{a,b},        x/{c_1,d_2}
+#   Commit A: y/{a,b,wham_1}, x/d_2, except y/wham has uncommitted mods
+#   Commit B: z/{a,b,wham_2}, x/c_1
+#   Expected: Failed Merge; y/{a,b} + untracked y/{wham~B^0,wham~B^HEAD} +
+#             y/wham with dirty changes from before merge +
+#             CONFLICT(rename/rename) x/c vs x/d -> y/wham
+#             ERROR_MSG(Refusing to lose dirty file at y/wham)
+
+test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+	test_create_repo 11f &&
+	(
+		cd 11f &&
+
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		test_seq 1 10 >x/c &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z/ y/ &&
+		git mv x/c y/wham &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/wham &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+	(
+		cd 11f &&
+
+		git checkout A^0 &&
+		echo important >>y/wham &&
+
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		test_seq 1 10 >expected &&
+		echo important >>expected &&
+		test_cmp expected y/wham &&
+
+		test_must_fail git rev-parse :1:y/wham &&
+		git hash-object >actual \
+			y/wham~B^0 y/wham~HEAD &&
+		git rev-parse >expect \
+			O:x/d      O:x/c &&
+		test_cmp expect actual &&
+
+		git rev-parse >actual \
+			:0:y/a :0:y/b :2:y/wham :3:y/wham &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/c     O:x/d &&
+		test_cmp expect actual
+	)
+'
+
+###########################################################################
+# SECTION 12: Everything else
+#
+# Tests suggested by others.  Tests added after implementation completed
+# and submitted.  Grab bag.
+###########################################################################
+
+# Testcase 12a, Moving one directory hierarchy into another
+#   (Related to testcase 9a)
+#   Commit O: node1/{leaf1,leaf2}, node2/{leaf3,leaf4}
+#   Commit A: node1/{leaf1,leaf2,node2/{leaf3,leaf4}}
+#   Commit B: node1/{leaf1,leaf2,leaf5}, node2/{leaf3,leaf4,leaf6}
+#   Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}}
+
+test_expect_success '12a-setup: Moving one directory hierarchy into another' '
+	test_create_repo 12a &&
+	(
+		cd 12a &&
+
+		mkdir -p node1 node2 &&
+		echo leaf1 >node1/leaf1 &&
+		echo leaf2 >node1/leaf2 &&
+		echo leaf3 >node2/leaf3 &&
+		echo leaf4 >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv node2/ node1/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo leaf5 >node1/leaf5 &&
+		echo leaf6 >node2/leaf6 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '12a-check: Moving one directory hierarchy into another' '
+	(
+		cd 12a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		git rev-parse >actual \
+			HEAD:node1/leaf1 HEAD:node1/leaf2 HEAD:node1/leaf5 \
+			HEAD:node1/node2/leaf3 \
+			HEAD:node1/node2/leaf4 \
+			HEAD:node1/node2/leaf6 &&
+		git rev-parse >expect \
+			O:node1/leaf1    O:node1/leaf2    B:node1/leaf5 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			B:node2/leaf6 &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12b, Moving two directory hierarchies into each other
+#   (Related to testcases 1c and 12c)
+#   Commit O: node1/{leaf1, leaf2}, node2/{leaf3, leaf4}
+#   Commit A: node1/{leaf1, leaf2, node2/{leaf3, leaf4}}
+#   Commit B: node2/{leaf3, leaf4, node1/{leaf1, leaf2}}
+#   Expected: node1/node2/node1/{leaf1, leaf2},
+#             node2/node1/node2/{leaf3, leaf4}
+#   NOTE: Without directory renames, we would expect
+#                   node2/node1/{leaf1, leaf2},
+#                   node1/node2/{leaf3, leaf4}
+#         with directory rename detection, we note that
+#             commit A renames node2/ -> node1/node2/
+#             commit B renames node1/ -> node2/node1/
+#         therefore, applying those directory renames to the initial result
+#         (making all four paths experience a transitive renaming), yields
+#         the expected result.
+#
+#         You may ask, is it weird to have two directories rename each other?
+#         To which, I can do no more than shrug my shoulders and say that
+#         even simple rules give weird results when given weird inputs.
+
+test_expect_success '12b-setup: Moving one directory hierarchy into another' '
+	test_create_repo 12b &&
+	(
+		cd 12b &&
+
+		mkdir -p node1 node2 &&
+		echo leaf1 >node1/leaf1 &&
+		echo leaf2 >node1/leaf2 &&
+		echo leaf3 >node2/leaf3 &&
+		echo leaf4 >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv node2/ node1/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv node1/ node2/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '12b-check: Moving one directory hierarchy into another' '
+	(
+		cd 12b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:node1/node2/node1/leaf1 \
+			HEAD:node1/node2/node1/leaf2 \
+			HEAD:node2/node1/node2/leaf3 \
+			HEAD:node2/node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12c, Moving two directory hierarchies into each other w/ content merge
+#   (Related to testcase 12b)
+#   Commit O: node1/{       leaf1_1, leaf2_1}, node2/{leaf3_1, leaf4_1}
+#   Commit A: node1/{       leaf1_2, leaf2_2,  node2/{leaf3_2, leaf4_2}}
+#   Commit B: node2/{node1/{leaf1_3, leaf2_3},        leaf3_3, leaf4_3}
+#   Expected: Content merge conflicts for each of:
+#               node1/node2/node1/{leaf1, leaf2},
+#               node2/node1/node2/{leaf3, leaf4}
+#   NOTE: This is *exactly* like 12c, except that every path is modified on
+#         each side of the merge.
+
+test_expect_success '12c-setup: Moving one directory hierarchy into another w/ content merge' '
+	test_create_repo 12c &&
+	(
+		cd 12c &&
+
+		mkdir -p node1 node2 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf2\n" >node1/leaf2 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf3\n" >node2/leaf3 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf4\n" >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv node2/ node1/ &&
+		for i in `git ls-files`; do echo side A >>$i; done &&
+		git add -u &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv node1/ node2/ &&
+		for i in `git ls-files`; do echo side B >>$i; done &&
+		git add -u &&
+		test_tick &&
+		git commit -m "B"
+	)
+'
+
+test_expect_success '12c-check: Moving one directory hierarchy into another w/ content merge' '
+	(
+		cd 12c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -u >out &&
+		test_line_count = 12 out &&
+
+		git rev-parse >actual \
+			:1:node1/node2/node1/leaf1 \
+			:1:node1/node2/node1/leaf2 \
+			:1:node2/node1/node2/leaf3 \
+			:1:node2/node1/node2/leaf4 \
+			:2:node1/node2/node1/leaf1 \
+			:2:node1/node2/node1/leaf2 \
+			:2:node2/node1/node2/leaf3 \
+			:2:node2/node1/node2/leaf4 \
+			:3:node1/node2/node1/leaf1 \
+			:3:node1/node2/node1/leaf2 \
+			:3:node2/node1/node2/leaf3 \
+			:3:node2/node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			A:node1/leaf1 \
+			A:node1/leaf2 \
+			A:node1/node2/leaf3 \
+			A:node1/node2/leaf4 \
+			B:node2/node1/leaf1 \
+			B:node2/node1/leaf2 \
+			B:node2/leaf3 \
+			B:node2/leaf4 &&
+		test_cmp expect actual
+	)
+'
+
+test_done
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index a5d9015..bae78c4 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -378,4 +378,12 @@ check_describe tags/A --all A
 check_describe tags/c --all c
 check_describe heads/branch_A --all --match='branch_*' branch_A
 
+test_expect_success 'describe complains about tree object' '
+	test_must_fail git describe HEAD^{tree}
+'
+
+test_expect_success 'describe complains about missing object' '
+	test_must_fail git describe $_z40
+'
+
 test_done
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 2e2fb0e..a54a52a 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -512,7 +512,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 
 	test_when_finished "git reset --hard" &&
 	annote=$(git rev-parse annote) &&
-	git merge --no-commit $annote &&
+	git merge --no-commit --no-ff $annote &&
 	{
 		cat <<-EOF
 		Merge tag '\''$annote'\''
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index c128dfc..295d147 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -373,11 +373,8 @@ test_expect_success 'Quoting style: tcl' '
 
 for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl"; do
 	test_expect_success "more than one quoting style: $i" "
-		git for-each-ref $i 2>&1 | (read line &&
-		case \$line in
-		\"error: more than one quoting style\"*) : happy;;
-		*) false
-		esac)
+		test_must_fail git for-each-ref $i 2>err &&
+		grep '^error: more than one quoting style' err
 	"
 done
 
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 6e5031f..d4e6485 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -39,6 +39,12 @@ test_expect_success \
     grep "^R100..*path1/COPYING..*path0/COPYING"'
 
 test_expect_success \
+    'mv --dry-run does not move file' \
+    'git mv -n path0/COPYING MOVED &&
+     test -f path0/COPYING &&
+     test ! -f MOVED'
+
+test_expect_success \
     'checking -k on non-existing file' \
     'git mv -k idontexist path0'
 
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 7cb6079..04f79f3 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -470,4 +470,18 @@ test_expect_success 'tree-filter deals with object name vs pathname ambiguity' '
 	git show HEAD:$ambiguous
 '
 
+test_expect_success 'rewrite repository including refs that point at non-commit object' '
+	test_when_finished "git reset --hard original" &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	test_when_finished "git replace -d $tree" &&
+	echo A >new &&
+	git add new &&
+	new_tree=$(git write-tree) &&
+	git replace $tree $new_tree &&
+	git tag -a -m "tag to a tree" treetag $new_tree &&
+	git reset --hard HEAD &&
+	git filter-branch -f -- --all >filter-output 2>&1 &&
+	! fgrep fatal filter-output
+'
+
 test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index a9af2de..2aac77a 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -452,6 +452,21 @@ test_expect_success \
 	test_cmp expect actual
 '
 
+get_tag_header annotated-tag-edit $commit commit $time >expect
+echo "An edited message" >>expect
+test_expect_success 'set up editor' '
+	write_script fakeeditor <<-\EOF
+	sed -e "s/A message/An edited message/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+'
+test_expect_success \
+	'creating an annotated tag with -m message --edit should succeed' '
+	GIT_EDITOR=./fakeeditor git tag -m "A message" --edit annotated-tag-edit &&
+	get_tag_msg annotated-tag-edit >actual &&
+	test_cmp expect actual
+'
+
 cat >msgfile <<EOF
 Another message
 in a file.
@@ -465,6 +480,21 @@ test_expect_success \
 	test_cmp expect actual
 '
 
+get_tag_header file-annotated-tag-edit $commit commit $time >expect
+sed -e "s/Another message/Another edited message/g" msgfile >>expect
+test_expect_success 'set up editor' '
+	write_script fakeeditor <<-\EOF
+	sed -e "s/Another message/Another edited message/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+'
+test_expect_success \
+	'creating an annotated tag with -F messagefile --edit should succeed' '
+	GIT_EDITOR=./fakeeditor git tag -F msgfile --edit file-annotated-tag-edit &&
+	get_tag_msg file-annotated-tag-edit >actual &&
+	test_cmp expect actual
+'
+
 cat >inputmsg <<EOF
 A message from the
 standard input
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index f5f46a9..7541ba5 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -110,13 +110,6 @@ test_expect_success TTY 'configuration can disable pager' '
 	! test -e paginated.out
 '
 
-test_expect_success TTY 'git config uses a pager if configured to' '
-	rm -f paginated.out &&
-	test_config pager.config true &&
-	test_terminal git config --list &&
-	test -e paginated.out
-'
-
 test_expect_success TTY 'configuration can enable pager (from subdir)' '
 	rm -f paginated.out &&
 	mkdir -p subdir &&
@@ -252,6 +245,48 @@ test_expect_success TTY 'git branch --set-upstream-to ignores pager.branch' '
 	! test -e paginated.out
 '
 
+test_expect_success TTY 'git config ignores pager.config when setting' '
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config foo.bar bar &&
+	! test -e paginated.out
+'
+
+test_expect_success TTY 'git config --edit ignores pager.config' '
+	rm -f paginated.out editor.used &&
+	write_script editor <<-\EOF &&
+		touch editor.used
+	EOF
+	EDITOR=./editor test_terminal git -c pager.config config --edit &&
+	! test -e paginated.out &&
+	test -e editor.used
+'
+
+test_expect_success TTY 'git config --get ignores pager.config' '
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config --get foo.bar &&
+	! test -e paginated.out
+'
+
+test_expect_success TTY 'git config --get-urlmatch defaults to paging' '
+	rm -f paginated.out &&
+	test_terminal git -c http."https://foo.com/".bar=foo \
+			  config --get-urlmatch http https://foo.com &&
+	test -e paginated.out
+'
+
+test_expect_success TTY 'git config --get-all respects pager.config' '
+	rm -f paginated.out &&
+	test_terminal git -c pager.config=false config --get-all foo.bar &&
+	! test -e paginated.out
+'
+
+test_expect_success TTY 'git config --list defaults to paging' '
+	rm -f paginated.out &&
+	test_terminal git config --list &&
+	test -e paginated.out
+'
+
+
 # A colored commit log will begin with an appropriate ANSI escape
 # for the first color; the text "commit" comes later.
 colorful() {
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index e5fb892..c61e304 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -14,6 +14,9 @@ test_description='test untracked cache'
 # See <20160803174522.5571-1-pclouds@gmail.com> if you want to know
 # more.
 
+GIT_FORCE_UNTRACKED_CACHE=true
+export GIT_FORCE_UNTRACKED_CACHE
+
 sync_mtime () {
 	find . -type d -ls >/dev/null
 }
@@ -22,6 +25,12 @@ avoid_racy() {
 	sleep 1
 }
 
+status_is_clean() {
+	>../status.expect &&
+	git status --porcelain >../status.actual &&
+	test_cmp ../status.expect ../status.actual
+}
+
 test_lazy_prereq UNTRACKED_CACHE '
 	{ git update-index --test-untracked-cache; ret=$?; } &&
 	test $ret -ne 1
@@ -683,4 +692,85 @@ test_expect_success 'untracked cache survives a commit' '
 	test_cmp ../before ../after
 '
 
+test_expect_success 'teardown worktree' '
+	cd ..
+'
+
+test_expect_success SYMLINKS 'setup worktree for symlink test' '
+	git init worktree-symlink &&
+	cd worktree-symlink &&
+	git config core.untrackedCache true &&
+	mkdir one two &&
+	touch one/file two/file &&
+	git add one/file two/file &&
+	git commit -m"first commit" &&
+	git rm -rf one &&
+	ln -s two one &&
+	git add one &&
+	git commit -m"second commit"
+'
+
+test_expect_success SYMLINKS '"status" after symlink replacement should be clean with UC=true' '
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout master &&
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+'
+
+test_expect_success SYMLINKS '"status" after symlink replacement should be clean with UC=false' '
+	git config core.untrackedCache false &&
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout master &&
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+'
+
+test_expect_success 'setup worktree for non-symlink test' '
+	git init worktree-non-symlink &&
+	cd worktree-non-symlink &&
+	git config core.untrackedCache true &&
+	mkdir one two &&
+	touch one/file two/file &&
+	git add one/file two/file &&
+	git commit -m"first commit" &&
+	git rm -rf one &&
+	cp two/file one &&
+	git add one &&
+	git commit -m"second commit"
+'
+
+test_expect_success '"status" after file replacement should be clean with UC=true' '
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout master &&
+	avoid_racy &&
+	status_is_clean &&
+	test-dump-untracked-cache >../actual &&
+	grep -F "recurse valid" ../actual >../actual.grep &&
+	cat >../expect.grep <<EOF &&
+/ 0000000000000000000000000000000000000000 recurse valid
+/two/ 0000000000000000000000000000000000000000 recurse valid
+EOF
+	status_is_clean &&
+	test_cmp ../expect.grep ../actual.grep
+'
+
+test_expect_success '"status" after file replacement should be clean with UC=false' '
+	git config core.untrackedCache false &&
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout master &&
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+'
+
 test_done
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index e319fa2..8f79532 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -390,6 +390,68 @@ test_expect_success 'verify upstream fields in branch header' '
 	)
 '
 
+test_expect_success 'verify --[no-]ahead-behind with V2 format' '
+	git checkout master &&
+	test_when_finished "rm -rf sub_repo" &&
+	git clone . sub_repo &&
+	(
+		## Confirm local master tracks remote master.
+		cd sub_repo &&
+		HUF=$(git rev-parse HEAD) &&
+
+		# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		EOF
+
+		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		# Confirm --ahead-behind reports traditional branch.ab with 0/0.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		EOF
+
+		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		## Test non-equal ahead/behind.
+		echo xyz >file_xyz &&
+		git add file_xyz &&
+		git commit -m xyz &&
+
+		HUF=$(git rev-parse HEAD) &&
+
+		# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +? -?
+		EOF
+
+		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		# Confirm --ahead-behind reports traditional branch.ab with 1/0.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +1 -0
+		EOF
+
+		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'create and add submodule, submodule appears clean (A. S...)' '
 	git checkout master &&
 	git clone . sub_repo &&
diff --git a/t/t7409-submodule-detached-work-tree.sh b/t/t7409-submodule-detached-work-tree.sh
index c207171..fc018e3 100755
--- a/t/t7409-submodule-detached-work-tree.sh
+++ b/t/t7409-submodule-detached-work-tree.sh
@@ -6,7 +6,7 @@
 test_description='Test submodules on detached working tree
 
 This test verifies that "git submodule" initialization, update and addition works
-on detahced working trees
+on detached working trees
 '
 
 TEST_NO_CREATE_REPO=1
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index eb2d13b..756beb0 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -314,4 +314,43 @@ test_expect_success 'splitting the index results in the same state' '
 	test_cmp expect actual
 '
 
+test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR' '
+	test_create_repo dot-git &&
+	(
+		cd dot-git &&
+		mkdir -p .git/hooks &&
+		: >tracked &&
+		: >modified &&
+		mkdir dir1 &&
+		: >dir1/tracked &&
+		: >dir1/modified &&
+		mkdir dir2 &&
+		: >dir2/tracked &&
+		: >dir2/modified &&
+		write_integration_script &&
+		git config core.fsmonitor .git/hooks/fsmonitor-test &&
+		git update-index --untracked-cache &&
+		git update-index --fsmonitor &&
+		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-before" \
+		git status &&
+		test-dump-untracked-cache >../before
+	) &&
+	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
+	printf ".git\0"
+	printf ".git/index\0"
+	printf "dir1/.git\0"
+	printf "dir1/.git/index\0"
+	EOF
+	(
+		cd dot-git &&
+		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-after" \
+		git status &&
+		test-dump-untracked-cache >../after
+	) &&
+	grep "directory invalidation" trace-before >>before &&
+	grep "directory invalidation" trace-after >>after &&
+	# UNTR extension unchanged, dir invalidation count unchanged
+	test_cmp before after
+'
+
 test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index dfde6a6..6736d8d 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -700,6 +700,42 @@ test_expect_success 'merge --no-ff --edit' '
 	test_cmp expected actual
 '
 
+test_expect_success 'merge annotated/signed tag w/o tracking' '
+	test_when_finished "rm -rf dst; git tag -d anno1" &&
+	git tag -a -m "anno c1" anno1 c1 &&
+	git init dst &&
+	git rev-parse c1 >dst/expect &&
+	(
+		# c0 fast-forwards to c1 but because this repository
+		# is not a "downstream" whose refs/tags follows along
+		# tag from the "upstream", this pull defaults to --no-ff
+		cd dst &&
+		git pull .. c0 &&
+		git pull .. anno1 &&
+		git rev-parse HEAD^2 >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'merge annotated/signed tag w/ tracking' '
+	test_when_finished "rm -rf dst; git tag -d anno1" &&
+	git tag -a -m "anno c1" anno1 c1 &&
+	git init dst &&
+	git rev-parse c1 >dst/expect &&
+	(
+		# c0 fast-forwards to c1 and because this repository
+		# is a "downstream" whose refs/tags follows along
+		# tag from the "upstream", this pull defaults to --ff
+		cd dst &&
+		git remote add origin .. &&
+		git pull origin c0 &&
+		git fetch origin &&
+		git merge anno1 &&
+		git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_expect_success GPG 'merge --ff-only tag' '
 	git reset --hard c0 &&
 	git commit --allow-empty -m "A newer commit" &&
@@ -718,7 +754,7 @@ test_expect_success GPG 'merge --no-edit tag should skip editor' '
 	git tag -f -s -m "A newer commit" signed &&
 	git reset --hard c0 &&
 
-	EDITOR=false git merge --no-edit signed &&
+	EDITOR=false git merge --no-edit --no-ff signed &&
 	git rev-parse signed^0 >expect &&
 	git rev-parse HEAD^2 >actual &&
 	test_cmp expect actual
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 9444d6a..dd8ab7e 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -92,12 +92,15 @@ test_expect_success 'will not overwrite removed file with staged changes' '
 	test_cmp important c1.c
 '
 
-test_expect_failure 'will not overwrite unstaged changes in renamed file' '
+test_expect_success 'will not overwrite unstaged changes in renamed file' '
 	git reset --hard c1 &&
 	git mv c1.c other.c &&
 	git commit -m rename &&
 	cp important other.c &&
-	git merge c1a &&
+	test_must_fail git merge c1a >out &&
+	test_i18ngrep "Refusing to lose dirty file at other.c" out &&
+	test_path_is_file other.c~HEAD &&
+	test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
 	test_cmp important other.c
 '
 
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 19601fb..e80eacb 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -224,6 +224,7 @@ Message-Id: MESSAGE-ID-STRING
 X-Mailer: X-MAILER-STRING
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
+Reply-To: Reply <reply@example.com>
 
 Result: OK
 EOF
@@ -316,6 +317,7 @@ test_expect_success $PREREQ 'Show all headers' '
 		--dry-run \
 		--suppress-cc=sob \
 		--from="Example <from@example.com>" \
+		--reply-to="Reply <reply@example.com>" \
 		--to=to@example.com \
 		--cc=cc@example.com \
 		--bcc=bcc@example.com \
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index c30660d..0674274 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -447,12 +447,10 @@ test_expect_success 'cvs update (-p)' '
     git push gitcvs.git >/dev/null &&
     cd cvswork &&
     GIT_CONFIG="$git_config" cvs update &&
-    rm -f failures &&
     for i in merge no-lf empty really-empty; do
-        GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
-	test_cmp $i.out ../$i >>failures 2>&1
-    done &&
-    test -z "$(cat failures)"
+	GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
+	test_cmp $i.out ../$i || return 1
+    done
 '
 
 cd "$WORKDIR"
diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
index 6d2d3c8..cf31ace 100755
--- a/t/t9402-git-cvsserver-refs.sh
+++ b/t/t9402-git-cvsserver-refs.sh
@@ -455,20 +455,20 @@ test_expect_success 'cvs up -r $(git rev-parse v1)' '
 '
 
 test_expect_success 'cvs diff -r v1 -u' '
-	( cd cvswork && cvs -f diff -r v1 -u ) >cvsDiff.out 2>cvs.log &&
+	( cd cvswork && cvs -f diff -r v1 -u >../cvsDiff.out 2>../cvs.log ) &&
 	test_must_be_empty cvsDiff.out &&
 	test_must_be_empty cvs.log
 '
 
 test_expect_success 'cvs diff -N -r v2 -u' '
-	( cd cvswork && ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
+	( cd cvswork && ! cvs -f diff -N -r v2 -u >../cvsDiff.out 2>../cvs.log ) &&
 	test_must_be_empty cvs.log &&
 	test -s cvsDiff.out &&
 	check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
 '
 
 test_expect_success 'cvs diff -N -r v2 -r v1.2' '
-	( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
+	( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u >../cvsDiff.out 2>../cvs.log ) &&
 	test_must_be_empty cvs.log &&
 	test -s cvsDiff.out &&
 	check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
@@ -487,7 +487,7 @@ test_expect_success 'apply early [cvswork3] diff to b3' '
 '
 
 test_expect_success 'check [cvswork3] diff' '
-	( cd cvswork3 && ! cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log &&
+	( cd cvswork3 && ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" 2>../cvs.log ) &&
 	test_must_be_empty cvs.log &&
 	test -s cvsDiff.out &&
 	test $(grep Index: cvsDiff.out | wc -l) = 3 &&
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index fc614dc..1b34caa 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1237,17 +1237,19 @@ test_expect_success 'double dash "git" itself' '
 test_expect_success 'double dash "git checkout"' '
 	test_completion "git checkout --" <<-\EOF
 	--quiet Z
+	--detach Z
+	--track Z
+	--orphan=Z
 	--ours Z
 	--theirs Z
-	--track Z
-	--no-track Z
 	--merge Z
-	--conflict=
-	--orphan Z
+	--conflict=Z
 	--patch Z
-	--detach Z
 	--ignore-skip-worktree-bits Z
+	--ignore-other-worktrees Z
 	--recurse-submodules Z
+	--progress Z
+	--no-track Z
 	--no-recurse-submodules Z
 	EOF
 '
@@ -1452,6 +1454,12 @@ test_expect_success 'completion used <cmd> completion for alias: !f() { : git <c
 	EOF
 '
 
+test_expect_success 'completion without explicit _git_xxx function' '
+	test_completion "git version --" <<-\EOF
+	--build-options Z
+	EOF
+'
+
 test_expect_failure 'complete with tilde expansion' '
 	git init tmp && cd tmp &&
 	test_when_finished "cd .. && rm -rf tmp" &&
@@ -1495,4 +1503,35 @@ do
 	'
 done
 
+test_expect_success 'sourcing the completion script clears cached commands' '
+	__git_compute_all_commands &&
+	verbose test -n "$__git_all_commands" &&
+	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+	verbose test -z "$__git_all_commands"
+'
+
+test_expect_success 'sourcing the completion script clears cached porcelain commands' '
+	__git_compute_porcelain_commands &&
+	verbose test -n "$__git_porcelain_commands" &&
+	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+	verbose test -z "$__git_porcelain_commands"
+'
+
+test_expect_success !GETTEXT_POISON 'sourcing the completion script clears cached merge strategies' '
+	__git_compute_merge_strategies &&
+	verbose test -n "$__git_merge_strategies" &&
+	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+	verbose test -z "$__git_merge_strategies"
+'
+
+test_expect_success 'sourcing the completion script clears cached --options' '
+	__gitcomp_builtin checkout &&
+	verbose test -n "$__gitcomp_builtin_checkout" &&
+	__gitcomp_builtin notes_edit &&
+	verbose test -n "$__gitcomp_builtin_notes_edit" &&
+	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+	verbose test -z "$__gitcomp_builtin_checkout" &&
+	verbose test -z "$__gitcomp_builtin_notes_edit"
+'
+
 test_done
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 97c9b32..8f5c811 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -735,22 +735,12 @@ test_expect_success 'prompt - hide if pwd ignored - env var set, config unset, p
 	test_cmp expected "$actual"
 '
 
-test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stdout)' '
+test_expect_success 'prompt - hide if pwd ignored - inside gitdir' '
 	printf " (GIT_DIR!)" >expected &&
 	(
 		GIT_PS1_HIDE_IF_PWD_IGNORED=y &&
 		cd .git &&
-		__git_ps1 >"$actual" 2>/dev/null
-	) &&
-	test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stderr)' '
-	printf "" >expected &&
-	(
-		GIT_PS1_HIDE_IF_PWD_IGNORED=y &&
-		cd .git &&
-		__git_ps1 >/dev/null 2>"$actual"
+		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"
 '
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index a679b02..7d620bf 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -610,6 +610,14 @@ list_contains () {
 #
 # Writing this as "! git checkout ../outerspace" is wrong, because
 # the failure could be due to a segv.  We want a controlled failure.
+#
+# Accepts the following options:
+#
+#   ok=<signal-name>[,<...>]:
+#     Don't treat an exit caused by the given signal as error.
+#     Multiple signals can be specified as a comma separated list.
+#     Currently recognized signal names are: sigpipe, success.
+#     (Don't use 'success', use 'test_might_fail' instead.)
 
 test_must_fail () {
 	case "$1" in
@@ -621,30 +629,30 @@ test_must_fail () {
 		_test_ok=
 		;;
 	esac
-	"$@"
+	"$@" 2>&7
 	exit_code=$?
 	if test $exit_code -eq 0 && ! list_contains "$_test_ok" success
 	then
-		echo >&2 "test_must_fail: command succeeded: $*"
+		echo >&4 "test_must_fail: command succeeded: $*"
 		return 1
 	elif test_match_signal 13 $exit_code && list_contains "$_test_ok" sigpipe
 	then
 		return 0
 	elif test $exit_code -gt 129 && test $exit_code -le 192
 	then
-		echo >&2 "test_must_fail: died by signal $(($exit_code - 128)): $*"
+		echo >&4 "test_must_fail: died by signal $(($exit_code - 128)): $*"
 		return 1
 	elif test $exit_code -eq 127
 	then
-		echo >&2 "test_must_fail: command not found: $*"
+		echo >&4 "test_must_fail: command not found: $*"
 		return 1
 	elif test $exit_code -eq 126
 	then
-		echo >&2 "test_must_fail: valgrind error: $*"
+		echo >&4 "test_must_fail: valgrind error: $*"
 		return 1
 	fi
 	return 0
-}
+} 7>&2 2>&4
 
 # Similar to test_must_fail, but tolerates success, too.  This is
 # meant to be used in contexts like:
@@ -656,10 +664,12 @@ test_must_fail () {
 #
 # Writing "git config --unset all.configuration || :" would be wrong,
 # because we want to notice if it fails due to segv.
+#
+# Accepts the same options as test_must_fail.
 
 test_might_fail () {
-	test_must_fail ok=success "$@"
-}
+	test_must_fail ok=success "$@" 2>&7
+} 7>&2 2>&4
 
 # Similar to test_must_fail and test_might_fail, but check that a
 # given command exited with a given exit code. Meant to be used as:
@@ -671,16 +681,16 @@ test_might_fail () {
 test_expect_code () {
 	want_code=$1
 	shift
-	"$@"
+	"$@" 2>&7
 	exit_code=$?
 	if test $exit_code = $want_code
 	then
 		return 0
 	fi
 
-	echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*"
+	echo >&4 "test_expect_code: command exited with $exit_code, we wanted $want_code $*"
 	return 1
-}
+} 7>&2 2>&4
 
 # test_cmp is a helper function to compare actual and expected output.
 # You can use it like:
@@ -705,12 +715,66 @@ test_cmp_bin() {
 	cmp "$@"
 }
 
+# Use this instead of test_cmp to compare files that contain expected and
+# actual output from git commands that can be translated.  When running
+# under GETTEXT_POISON this pretends that the command produced expected
+# results.
+test_i18ncmp () {
+	test -n "$GETTEXT_POISON" || test_cmp "$@"
+}
+
+# Use this instead of "grep expected-string actual" to see if the
+# output from a git command that can be translated either contains an
+# expected string, or does not contain an unwanted one.  When running
+# under GETTEXT_POISON this pretends that the command produced expected
+# results.
+test_i18ngrep () {
+	eval "last_arg=\${$#}"
+
+	test -f "$last_arg" ||
+	error "bug in the test script: test_i18ngrep requires a file" \
+	      "to read as the last parameter"
+
+	if test $# -lt 2 ||
+	   { test "x!" = "x$1" && test $# -lt 3 ; }
+	then
+		error "bug in the test script: too few parameters to test_i18ngrep"
+	fi
+
+	if test -n "$GETTEXT_POISON"
+	then
+		# pretend success
+		return 0
+	fi
+
+	if test "x!" = "x$1"
+	then
+		shift
+		! grep "$@" && return 0
+
+		echo >&4 "error: '! grep $@' did find a match in:"
+	else
+		grep "$@" && return 0
+
+		echo >&4 "error: 'grep $@' didn't find a match in:"
+	fi
+
+	if test -s "$last_arg"
+	then
+		cat >&4 "$last_arg"
+	else
+		echo >&4 "<File '$last_arg' is empty>"
+	fi
+
+	return 1
+}
+
 # Call any command "$@" but be more verbose about its
 # failure. This is handy for commands like "test" which do
 # not output anything when they fail.
 verbose () {
 	"$@" && return 0
-	echo >&2 "command failed: $(git rev-parse --sq-quote "$@")"
+	echo >&4 "command failed: $(git rev-parse --sq-quote "$@")"
 	return 1
 }
 
@@ -718,6 +782,7 @@ verbose () {
 # otherwise.
 
 test_must_be_empty () {
+	test_path_is_file "$1" &&
 	if test -s "$1"
 	then
 		echo "'$1' is not empty, it contains:"
@@ -828,8 +893,8 @@ test_write_lines () {
 }
 
 perl () {
-	command "$PERL_PATH" "$@"
-}
+	command "$PERL_PATH" "$@" 2>&7
+} 7>&2 2>&4
 
 # Is the value one of the various ways to spell a boolean true/false?
 test_normalize_bool () {
@@ -969,13 +1034,13 @@ test_env () {
 				shift
 				;;
 			*)
-				"$@"
+				"$@" 2>&7
 				exit
 				;;
 			esac
 		done
 	)
-}
+} 7>&2 2>&4
 
 # Returns true if the numeric exit code in "$2" represents the expected signal
 # in "$1". Signals should be given numerically.
@@ -1017,9 +1082,9 @@ nongit () {
 		GIT_CEILING_DIRECTORIES=$(pwd) &&
 		export GIT_CEILING_DIRECTORIES &&
 		cd non-repo &&
-		"$@"
+		"$@" 2>&7
 	)
-}
+} 7>&2 2>&4
 
 # convert stdin to pktline representation; note that empty input becomes an
 # empty packet, not a flush packet (for that you can just print 0000 yourself).
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9af1905..7740d51 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -116,6 +116,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
 	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
 	print join("\n", @vars);
 ')
+unset XDG_CACHE_HOME
 unset XDG_CONFIG_HOME
 unset GITPERLLIB
 GIT_AUTHOR_EMAIL=author@example.com
@@ -263,7 +264,24 @@ do
 		GIT_TEST_CHAIN_LINT=0
 		shift ;;
 	-x)
-		trace=t
+		# Some test scripts can't be reliably traced  with '-x',
+		# unless the test is run with a Bash version supporting
+		# BASH_XTRACEFD (introduced in Bash v4.1).  Check whether
+		# this test is marked as such, and ignore '-x' if it
+		# isn't executed with a suitable Bash version.
+		if test -z "$test_untraceable" || {
+		     test -n "$BASH_VERSION" && {
+		       test ${BASH_VERSINFO[0]} -gt 4 || {
+			 test ${BASH_VERSINFO[0]} -eq 4 &&
+			 test ${BASH_VERSINFO[1]} -ge 1
+		       }
+		     }
+		   }
+		then
+			trace=t
+		else
+			echo >&2 "warning: ignoring -x; '$0' is untraceable without BASH_XTRACEFD"
+		fi
 		shift ;;
 	--verbose-log)
 		verbose_log=t
@@ -1062,32 +1080,6 @@ else
 	test_set_prereq C_LOCALE_OUTPUT
 fi
 
-# Use this instead of test_cmp to compare files that contain expected and
-# actual output from git commands that can be translated.  When running
-# under GETTEXT_POISON this pretends that the command produced expected
-# results.
-test_i18ncmp () {
-	test -n "$GETTEXT_POISON" || test_cmp "$@"
-}
-
-# Use this instead of "grep expected-string actual" to see if the
-# output from a git command that can be translated either contains an
-# expected string, or does not contain an unwanted one.  When running
-# under GETTEXT_POISON this pretends that the command produced expected
-# results.
-test_i18ngrep () {
-	if test -n "$GETTEXT_POISON"
-	then
-	    : # pretend success
-	elif test "x!" = "x$1"
-	then
-		shift
-		! grep "$@"
-	else
-		grep "$@"
-	fi
-}
-
 test_lazy_prereq PIPE '
 	# test whether the filesystem supports FIFOs
 	test_have_prereq !MINGW,!CYGWIN &&
@@ -1132,6 +1124,10 @@ test_lazy_prereq EXPENSIVE '
 	test -n "$GIT_TEST_LONG"
 '
 
+test_lazy_prereq EXPENSIVE_ON_WINDOWS '
+	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+'
+
 test_lazy_prereq USR_BIN_TIME '
 	test -x /usr/bin/time
 '
diff --git a/tag.c b/tag.c
index fcbe012..86b1dcb 100644
--- a/tag.c
+++ b/tag.c
@@ -41,20 +41,20 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
 	unsigned long size;
 	int ret;
 
-	type = sha1_object_info(oid->hash, NULL);
+	type = oid_object_info(oid, NULL);
 	if (type != OBJ_TAG)
 		return error("%s: cannot verify a non-tag object of type %s.",
 				name_to_report ?
 				name_to_report :
-				find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
-				typename(type));
+				find_unique_abbrev(oid, DEFAULT_ABBREV),
+				type_name(type));
 
-	buf = read_sha1_file(oid->hash, &type, &size);
+	buf = read_object_file(oid, &type, &size);
 	if (!buf)
 		return error("%s: unable to read file.",
 				name_to_report ?
 				name_to_report :
-				find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+				find_unique_abbrev(oid, DEFAULT_ABBREV));
 
 	ret = run_gpg_verify(buf, size, flags);
 
@@ -182,7 +182,7 @@ int parse_tag(struct tag *item)
 
 	if (item->object.parsed)
 		return 0;
-	data = read_sha1_file(item->object.oid.hash, &type, &size);
+	data = read_object_file(&item->object.oid, &type, &size);
 	if (!data)
 		return error("Could not read %s",
 			     oid_to_hex(&item->object.oid));
diff --git a/tempfile.c b/tempfile.c
index 5fdafdd..139ecd9 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -165,11 +165,11 @@ struct tempfile *register_tempfile(const char *path)
 	return tempfile;
 }
 
-struct tempfile *mks_tempfile_sm(const char *template, int suffixlen, int mode)
+struct tempfile *mks_tempfile_sm(const char *filename_template, int suffixlen, int mode)
 {
 	struct tempfile *tempfile = new_tempfile();
 
-	strbuf_add_absolute_path(&tempfile->filename, template);
+	strbuf_add_absolute_path(&tempfile->filename, filename_template);
 	tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
 	if (tempfile->fd < 0) {
 		deactivate_tempfile(tempfile);
@@ -179,7 +179,7 @@ struct tempfile *mks_tempfile_sm(const char *template, int suffixlen, int mode)
 	return tempfile;
 }
 
-struct tempfile *mks_tempfile_tsm(const char *template, int suffixlen, int mode)
+struct tempfile *mks_tempfile_tsm(const char *filename_template, int suffixlen, int mode)
 {
 	struct tempfile *tempfile = new_tempfile();
 	const char *tmpdir;
@@ -188,7 +188,7 @@ struct tempfile *mks_tempfile_tsm(const char *template, int suffixlen, int mode)
 	if (!tmpdir)
 		tmpdir = "/tmp";
 
-	strbuf_addf(&tempfile->filename, "%s/%s", tmpdir, template);
+	strbuf_addf(&tempfile->filename, "%s/%s", tmpdir, filename_template);
 	tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
 	if (tempfile->fd < 0) {
 		deactivate_tempfile(tempfile);
@@ -198,12 +198,12 @@ struct tempfile *mks_tempfile_tsm(const char *template, int suffixlen, int mode)
 	return tempfile;
 }
 
-struct tempfile *xmks_tempfile_m(const char *template, int mode)
+struct tempfile *xmks_tempfile_m(const char *filename_template, int mode)
 {
 	struct tempfile *tempfile;
 	struct strbuf full_template = STRBUF_INIT;
 
-	strbuf_add_absolute_path(&full_template, template);
+	strbuf_add_absolute_path(&full_template, filename_template);
 	tempfile = mks_tempfile_m(full_template.buf, mode);
 	if (!tempfile)
 		die_errno("Unable to create temporary file '%s'",
diff --git a/tempfile.h b/tempfile.h
index 450908b..8959c5f 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -135,58 +135,58 @@ extern struct tempfile *register_tempfile(const char *path);
  */
 
 /* See "mks_tempfile functions" above. */
-extern struct tempfile *mks_tempfile_sm(const char *template,
+extern struct tempfile *mks_tempfile_sm(const char *filename_template,
 					int suffixlen, int mode);
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *mks_tempfile_s(const char *template,
+static inline struct tempfile *mks_tempfile_s(const char *filename_template,
 					      int suffixlen)
 {
-	return mks_tempfile_sm(template, suffixlen, 0600);
+	return mks_tempfile_sm(filename_template, suffixlen, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *mks_tempfile_m(const char *template, int mode)
+static inline struct tempfile *mks_tempfile_m(const char *filename_template, int mode)
 {
-	return mks_tempfile_sm(template, 0, mode);
+	return mks_tempfile_sm(filename_template, 0, mode);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *mks_tempfile(const char *template)
+static inline struct tempfile *mks_tempfile(const char *filename_template)
 {
-	return mks_tempfile_sm(template, 0, 0600);
+	return mks_tempfile_sm(filename_template, 0, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-extern struct tempfile *mks_tempfile_tsm(const char *template,
+extern struct tempfile *mks_tempfile_tsm(const char *filename_template,
 					 int suffixlen, int mode);
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *mks_tempfile_ts(const char *template,
+static inline struct tempfile *mks_tempfile_ts(const char *filename_template,
 					       int suffixlen)
 {
-	return mks_tempfile_tsm(template, suffixlen, 0600);
+	return mks_tempfile_tsm(filename_template, suffixlen, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *mks_tempfile_tm(const char *template, int mode)
+static inline struct tempfile *mks_tempfile_tm(const char *filename_template, int mode)
 {
-	return mks_tempfile_tsm(template, 0, mode);
+	return mks_tempfile_tsm(filename_template, 0, mode);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *mks_tempfile_t(const char *template)
+static inline struct tempfile *mks_tempfile_t(const char *filename_template)
 {
-	return mks_tempfile_tsm(template, 0, 0600);
+	return mks_tempfile_tsm(filename_template, 0, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-extern struct tempfile *xmks_tempfile_m(const char *template, int mode);
+extern struct tempfile *xmks_tempfile_m(const char *filename_template, int mode);
 
 /* See "mks_tempfile functions" above. */
-static inline struct tempfile *xmks_tempfile(const char *template)
+static inline struct tempfile *xmks_tempfile(const char *filename_template)
 {
-	return xmks_tempfile_m(template, 0600);
+	return xmks_tempfile_m(filename_template, 0600);
 }
 
 /*
diff --git a/trailer.c b/trailer.c
index 3ba157e..c508c9b 100644
--- a/trailer.c
+++ b/trailer.c
@@ -174,12 +174,12 @@ static void print_all(FILE *outfile, struct list_head *head,
 
 static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
 {
-	struct trailer_item *new = xcalloc(sizeof(*new), 1);
-	new->token = arg_tok->token;
-	new->value = arg_tok->value;
+	struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+	new_item->token = arg_tok->token;
+	new_item->value = arg_tok->value;
 	arg_tok->token = arg_tok->value = NULL;
 	free_arg_item(arg_tok);
-	return new;
+	return new_item;
 }
 
 static void add_arg_to_input_list(struct trailer_item *on_tok,
@@ -666,30 +666,30 @@ static void parse_trailer(struct strbuf *tok, struct strbuf *val,
 static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
 					     char *val)
 {
-	struct trailer_item *new = xcalloc(sizeof(*new), 1);
-	new->token = tok;
-	new->value = val;
-	list_add_tail(&new->list, head);
-	return new;
+	struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+	new_item->token = tok;
+	new_item->value = val;
+	list_add_tail(&new_item->list, head);
+	return new_item;
 }
 
 static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
 			 const struct conf_info *conf,
 			 const struct new_trailer_item *new_trailer_item)
 {
-	struct arg_item *new = xcalloc(sizeof(*new), 1);
-	new->token = tok;
-	new->value = val;
-	duplicate_conf(&new->conf, conf);
+	struct arg_item *new_item = xcalloc(sizeof(*new_item), 1);
+	new_item->token = tok;
+	new_item->value = val;
+	duplicate_conf(&new_item->conf, conf);
 	if (new_trailer_item) {
 		if (new_trailer_item->where != WHERE_DEFAULT)
-			new->conf.where = new_trailer_item->where;
+			new_item->conf.where = new_trailer_item->where;
 		if (new_trailer_item->if_exists != EXISTS_DEFAULT)
-			new->conf.if_exists = new_trailer_item->if_exists;
+			new_item->conf.if_exists = new_trailer_item->if_exists;
 		if (new_trailer_item->if_missing != MISSING_DEFAULT)
-			new->conf.if_missing = new_trailer_item->if_missing;
+			new_item->conf.if_missing = new_trailer_item->if_missing;
 	}
-	list_add_tail(&new->list, arg_head);
+	list_add_tail(&new_item->list, arg_head);
 }
 
 static void process_command_line_args(struct list_head *arg_head,
@@ -1000,7 +1000,7 @@ static struct tempfile *trailers_tempfile;
 static FILE *create_in_place_tempfile(const char *file)
 {
 	struct stat st;
-	struct strbuf template = STRBUF_INIT;
+	struct strbuf filename_template = STRBUF_INIT;
 	const char *tail;
 	FILE *outfile;
 
@@ -1014,11 +1014,11 @@ static FILE *create_in_place_tempfile(const char *file)
 	/* Create temporary file in the same directory as the original */
 	tail = strrchr(file, '/');
 	if (tail != NULL)
-		strbuf_add(&template, file, tail - file + 1);
-	strbuf_addstr(&template, "git-interpret-trailers-XXXXXX");
+		strbuf_add(&filename_template, file, tail - file + 1);
+	strbuf_addstr(&filename_template, "git-interpret-trailers-XXXXXX");
 
-	trailers_tempfile = xmks_tempfile_m(template.buf, st.st_mode);
-	strbuf_release(&template);
+	trailers_tempfile = xmks_tempfile_m(filename_template.buf, st.st_mode);
+	strbuf_release(&filename_template);
 	outfile = fdopen_tempfile(trailers_tempfile, "w");
 	if (!outfile)
 		die_errno(_("could not open temporary file"));
diff --git a/transport.c b/transport.c
index 3afc632..94eccf2 100644
--- a/transport.c
+++ b/transport.c
@@ -368,7 +368,7 @@ static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_widt
 		char type;
 		const char *msg;
 
-		strbuf_add_unique_abbrev(&quickref, ref->old_oid.hash,
+		strbuf_add_unique_abbrev(&quickref, &ref->old_oid,
 					 DEFAULT_ABBREV);
 		if (ref->forced_update) {
 			strbuf_addstr(&quickref, "...");
@@ -379,7 +379,7 @@ static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_widt
 			type = ' ';
 			msg = NULL;
 		}
-		strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash,
+		strbuf_add_unique_abbrev(&quickref, &ref->new_oid,
 					 DEFAULT_ABBREV);
 
 		print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg,
@@ -462,7 +462,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count,
 static int measure_abbrev(const struct object_id *oid, int sofar)
 {
 	char hex[GIT_MAX_HEXSZ + 1];
-	int w = find_unique_abbrev_r(hex, oid->hash, DEFAULT_ABBREV);
+	int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV);
 
 	return (w < sofar) ? sofar : w;
 }
diff --git a/tree-walk.c b/tree-walk.c
index 63a87ed..e11b306 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -84,8 +84,7 @@ void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
 	void *buf = NULL;
 
 	if (oid) {
-		buf = read_object_with_reference(oid->hash, tree_type, &size,
-						 NULL);
+		buf = read_object_with_reference(oid, tree_type, &size, NULL);
 		if (!buf)
 			die("unable to read tree %s", oid_to_hex(oid));
 	}
@@ -492,7 +491,7 @@ struct dir_state {
 	unsigned char sha1[20];
 };
 
-static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result, unsigned *mode)
+static int find_tree_entry(struct tree_desc *t, const char *name, struct object_id *result, unsigned *mode)
 {
 	int namelen = strlen(name);
 	while (t->size) {
@@ -511,7 +510,7 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
 		if (cmp < 0)
 			break;
 		if (entrylen == namelen) {
-			hashcpy(result, oid->hash);
+			oidcpy(result, oid);
 			return 0;
 		}
 		if (name[entrylen] != '/')
@@ -519,27 +518,27 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
 		if (!S_ISDIR(*mode))
 			break;
 		if (++entrylen == namelen) {
-			hashcpy(result, oid->hash);
+			oidcpy(result, oid);
 			return 0;
 		}
-		return get_tree_entry(oid->hash, name + entrylen, result, mode);
+		return get_tree_entry(oid, name + entrylen, result, mode);
 	}
 	return -1;
 }
 
-int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned char *sha1, unsigned *mode)
+int get_tree_entry(const struct object_id *tree_oid, const char *name, struct object_id *oid, unsigned *mode)
 {
 	int retval;
 	void *tree;
 	unsigned long size;
-	unsigned char root[20];
+	struct object_id root;
 
-	tree = read_object_with_reference(tree_sha1, tree_type, &size, root);
+	tree = read_object_with_reference(tree_oid, tree_type, &size, &root);
 	if (!tree)
 		return -1;
 
 	if (name[0] == '\0') {
-		hashcpy(sha1, root);
+		oidcpy(oid, &root);
 		free(tree);
 		return 0;
 	}
@@ -549,7 +548,7 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
 	} else {
 		struct tree_desc t;
 		init_tree_desc(&t, tree, size);
-		retval = find_tree_entry(&t, name, sha1, mode);
+		retval = find_tree_entry(&t, name, oid, mode);
 	}
 	free(tree);
 	return retval;
@@ -583,14 +582,14 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 	struct dir_state *parents = NULL;
 	size_t parents_alloc = 0;
 	size_t i, parents_nr = 0;
-	unsigned char current_tree_sha1[20];
+	struct object_id current_tree_oid;
 	struct strbuf namebuf = STRBUF_INIT;
 	struct tree_desc t;
 	int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
 
 	init_tree_desc(&t, NULL, 0UL);
 	strbuf_addstr(&namebuf, name);
-	hashcpy(current_tree_sha1, tree_sha1);
+	hashcpy(current_tree_oid.hash, tree_sha1);
 
 	while (1) {
 		int find_result;
@@ -599,22 +598,22 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 
 		if (!t.buffer) {
 			void *tree;
-			unsigned char root[20];
+			struct object_id root;
 			unsigned long size;
-			tree = read_object_with_reference(current_tree_sha1,
+			tree = read_object_with_reference(&current_tree_oid,
 							  tree_type, &size,
-							  root);
+							  &root);
 			if (!tree)
 				goto done;
 
 			ALLOC_GROW(parents, parents_nr + 1, parents_alloc);
 			parents[parents_nr].tree = tree;
 			parents[parents_nr].size = size;
-			hashcpy(parents[parents_nr].sha1, root);
+			hashcpy(parents[parents_nr].sha1, root.hash);
 			parents_nr++;
 
 			if (namebuf.buf[0] == '\0') {
-				hashcpy(result, root);
+				hashcpy(result, root.hash);
 				retval = FOUND;
 				goto done;
 			}
@@ -671,14 +670,14 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 
 		/* Look up the first (or only) path component in the tree. */
 		find_result = find_tree_entry(&t, namebuf.buf,
-					      current_tree_sha1, mode);
+					      &current_tree_oid, mode);
 		if (find_result) {
 			goto done;
 		}
 
 		if (S_ISDIR(*mode)) {
 			if (!remainder) {
-				hashcpy(result, current_tree_sha1);
+				hashcpy(result, current_tree_oid.hash);
 				retval = FOUND;
 				goto done;
 			}
@@ -688,7 +687,7 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 				      1 + first_slash - namebuf.buf);
 		} else if (S_ISREG(*mode)) {
 			if (!remainder) {
-				hashcpy(result, current_tree_sha1);
+				hashcpy(result, current_tree_oid.hash);
 				retval = FOUND;
 			} else {
 				retval = NOT_DIR;
@@ -714,8 +713,8 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 			 */
 			retval = DANGLING_SYMLINK;
 
-			contents = read_sha1_file(current_tree_sha1, &type,
-						  &link_len);
+			contents = read_object_file(&current_tree_oid, &type,
+						    &link_len);
 
 			if (!contents)
 				goto done;
diff --git a/tree-walk.h b/tree-walk.h
index b6bd1b4..4617dee 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -79,7 +79,7 @@ struct traverse_info {
 	int show_all_errors;
 };
 
-int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
+int get_tree_entry(const struct object_id *, const char *, struct object_id *, unsigned *);
 extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
 extern void setup_traverse_info(struct traverse_info *info, const char *base);
 
diff --git a/tree.c b/tree.c
index b224115..1c68ea5 100644
--- a/tree.c
+++ b/tree.c
@@ -10,7 +10,7 @@
 const char *tree_type = "tree";
 
 static int read_one_entry_opt(struct index_state *istate,
-			      const unsigned char *sha1,
+			      const struct object_id *oid,
 			      const char *base, int baselen,
 			      const char *pathname,
 			      unsigned mode, int stage, int opt)
@@ -31,16 +31,16 @@ static int read_one_entry_opt(struct index_state *istate,
 	ce->ce_namelen = baselen + len;
 	memcpy(ce->name, base, baselen);
 	memcpy(ce->name + baselen, pathname, len+1);
-	hashcpy(ce->oid.hash, sha1);
+	oidcpy(&ce->oid, oid);
 	return add_index_entry(istate, ce, opt);
 }
 
-static int read_one_entry(const unsigned char *sha1, struct strbuf *base,
+static int read_one_entry(const struct object_id *oid, struct strbuf *base,
 			  const char *pathname, unsigned mode, int stage,
 			  void *context)
 {
 	struct index_state *istate = context;
-	return read_one_entry_opt(istate, sha1, base->buf, base->len, pathname,
+	return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
 				  mode, stage,
 				  ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
 }
@@ -49,12 +49,12 @@ static int read_one_entry(const unsigned char *sha1, struct strbuf *base,
  * This is used when the caller knows there is no existing entries at
  * the stage that will conflict with the entry being added.
  */
-static int read_one_entry_quick(const unsigned char *sha1, struct strbuf *base,
+static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
 				const char *pathname, unsigned mode, int stage,
 				void *context)
 {
 	struct index_state *istate = context;
-	return read_one_entry_opt(istate, sha1, base->buf, base->len, pathname,
+	return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
 				  mode, stage,
 				  ADD_CACHE_JUST_APPEND);
 }
@@ -83,7 +83,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
 				continue;
 		}
 
-		switch (fn(entry.oid->hash, base,
+		switch (fn(entry.oid, base,
 			   entry.path, entry.mode, stage, context)) {
 		case 0:
 			continue;
@@ -219,7 +219,7 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)
 
 	if (item->object.parsed)
 		return 0;
-	buffer = read_sha1_file(item->object.oid.hash, &type, &size);
+	buffer = read_object_file(&item->object.oid, &type, &size);
 	if (!buffer)
 		return quiet_on_missing ? -1 :
 			error("Could not read %s",
diff --git a/tree.h b/tree.h
index 744e6dc..e2a80be 100644
--- a/tree.h
+++ b/tree.h
@@ -27,7 +27,7 @@ void free_tree_buffer(struct tree *tree);
 struct tree *parse_tree_indirect(const struct object_id *oid);
 
 #define READ_TREE_RECURSIVE 1
-typedef int (*read_tree_fn_t)(const unsigned char *, struct strbuf *, const char *, unsigned int, int, void *);
+typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
 
 extern int read_tree_recursive(struct tree *tree,
 			       const char *base, int baselen,
diff --git a/unpack-trees.c b/unpack-trees.c
index e6a15bb..79fd970 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -195,10 +195,10 @@ static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
 static struct cache_entry *dup_entry(const struct cache_entry *ce)
 {
 	unsigned int size = ce_size(ce);
-	struct cache_entry *new = xmalloc(size);
+	struct cache_entry *new_entry = xmalloc(size);
 
-	memcpy(new, ce, size);
-	return new;
+	memcpy(new_entry, ce, size);
+	return new_entry;
 }
 
 static void add_entry(struct unpack_trees_options *o,
@@ -391,6 +391,7 @@ static int check_updates(struct unpack_trees_options *o)
 			fetch_objects(repository_format_partial_clone,
 				      &to_fetch);
 		fetch_if_missing = fetch_if_missing_store;
+		oid_array_clear(&to_fetch);
 	}
 	for (i = 0; i < index->cache_nr; i++) {
 		struct cache_entry *ce = index->cache[i];
@@ -1508,8 +1509,8 @@ static int verify_uptodate_1(const struct cache_entry *ce,
 		add_rejected_path(o, error_type, ce->name);
 }
 
-static int verify_uptodate(const struct cache_entry *ce,
-			   struct unpack_trees_options *o)
+int verify_uptodate(const struct cache_entry *ce,
+		    struct unpack_trees_options *o)
 {
 	if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
 		return 0;
@@ -1528,7 +1529,7 @@ static void invalidate_ce_path(const struct cache_entry *ce,
 	if (!ce)
 		return;
 	cache_tree_invalidate_path(o->src_index, ce->name);
-	untracked_cache_invalidate_path(o->src_index, ce->name);
+	untracked_cache_invalidate_path(o->src_index, ce->name, 1);
 }
 
 /*
diff --git a/unpack-trees.h b/unpack-trees.h
index 6c48117b..41178ad 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -1,6 +1,7 @@
 #ifndef UNPACK_TREES_H
 #define UNPACK_TREES_H
 
+#include "tree-walk.h"
 #include "string-list.h"
 
 #define MAX_UNPACK_TREES 8
@@ -78,6 +79,9 @@ struct unpack_trees_options {
 extern int unpack_trees(unsigned n, struct tree_desc *t,
 		struct unpack_trees_options *options);
 
+int verify_uptodate(const struct cache_entry *ce,
+		    struct unpack_trees_options *o);
+
 int threeway_merge(const struct cache_entry * const *stages,
 		   struct unpack_trees_options *o);
 int twoway_merge(const struct cache_entry * const *src,
diff --git a/upload-pack.c b/upload-pack.c
index f51b6cf..4a82602 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -69,7 +69,7 @@ static int stateless_rpc;
 static const char *pack_objects_hook;
 
 static int filter_capability_requested;
-static int filter_advertise;
+static int allow_filter;
 static struct list_objects_filter_options filter_options;
 
 static void reset_timeout(void)
@@ -846,7 +846,7 @@ static void receive_needs(void)
 			no_progress = 1;
 		if (parse_feature_request(features, "include-tag"))
 			use_include_tag = 1;
-		if (parse_feature_request(features, "filter"))
+		if (allow_filter && parse_feature_request(features, "filter"))
 			filter_capability_requested = 1;
 
 		o = parse_object(&oid_buf);
@@ -976,7 +976,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
 				     " allow-reachable-sha1-in-want" : "",
 			     stateless_rpc ? " no-done" : "",
 			     symref_info.buf,
-			     filter_advertise ? " filter" : "",
+			     allow_filter ? " filter" : "",
 			     git_user_agent_sanitized());
 		strbuf_release(&symref_info);
 	} else {
@@ -1056,7 +1056,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
 		if (!strcmp("uploadpack.packobjectshook", var))
 			return git_config_string(&pack_objects_hook, var, value);
 	} else if (!strcmp("uploadpack.allowfilter", var)) {
-		filter_advertise = git_config_bool(var, value);
+		allow_filter = git_config_bool(var, value);
 	}
 	return parse_hide_refs_config(var, value, "uploadpack");
 }
diff --git a/userdiff.c b/userdiff.c
index dbfb4e1..a69241b 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -38,6 +38,15 @@ IPATTERN("fortran",
 	 "|//|\\*\\*|::|[/<>=]="),
 IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
 	 "[^ \t-]+"),
+PATTERNS("golang",
+	 /* Functions */
+	 "^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n"
+	 /* Structs and interfaces */
+	 "^[ \t]*(type[ \t].*(struct|interface)[ \t]*(\\{[ \t]*)?)",
+	 /* -- */
+	 "[a-zA-Z_][a-zA-Z0-9_]*"
+	 "|[-+0-9.eE]+i?|0[xX]?[0-9a-fA-F]+i?"
+	 "|[-+*/<>%&^|=!:]=|--|\\+\\+|<<=?|>>=?|&\\^=?|&&|\\|\\||<-|\\.{3}"),
 PATTERNS("html", "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$",
 	 "[^<>= \t]+"),
 PATTERNS("java",
@@ -138,7 +147,7 @@ PATTERNS("csharp",
 	 /* Keywords */
 	 "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
 	 /* Methods and constructors */
-	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n"
+	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe|async)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n"
 	 /* Properties */
 	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n"
 	 /* Type definitions */
diff --git a/walker.c b/walker.c
index 5d4d373..dffb9c8 100644
--- a/walker.c
+++ b/walker.c
@@ -22,7 +22,7 @@ void walker_say(struct walker *walker, const char *fmt, ...)
 static void report_missing(const struct object *obj)
 {
 	fprintf(stderr, "Cannot obtain needed %s %s\n",
-		obj->type ? typename(obj->type): "object",
+		obj->type ? type_name(obj->type): "object",
 		oid_to_hex(&obj->oid));
 	if (!is_null_oid(&current_commit_oid))
 		fprintf(stderr, "while processing commit %s.\n",
@@ -134,7 +134,7 @@ static int process_object(struct walker *walker, struct object *obj)
 	}
 	return error("Unable to determine requirements "
 		     "of type %s for %s",
-		     typename(obj->type), oid_to_hex(&obj->oid));
+		     type_name(obj->type), oid_to_hex(&obj->oid));
 }
 
 static int process(struct walker *walker, struct object *obj)
diff --git a/worktree.c b/worktree.c
index f5da7d2..28989cf 100644
--- a/worktree.c
+++ b/worktree.c
@@ -254,6 +254,102 @@ const char *is_worktree_locked(struct worktree *wt)
 	return wt->lock_reason;
 }
 
+/* convenient wrapper to deal with NULL strbuf */
+static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
+{
+	va_list params;
+
+	if (!buf)
+		return;
+
+	va_start(params, fmt);
+	strbuf_vaddf(buf, fmt, params);
+	va_end(params);
+}
+
+int validate_worktree(const struct worktree *wt, struct strbuf *errmsg,
+		      unsigned flags)
+{
+	struct strbuf wt_path = STRBUF_INIT;
+	char *path = NULL;
+	int err, ret = -1;
+
+	strbuf_addf(&wt_path, "%s/.git", wt->path);
+
+	if (is_main_worktree(wt)) {
+		if (is_directory(wt_path.buf)) {
+			ret = 0;
+			goto done;
+		}
+		/*
+		 * Main worktree using .git file to point to the
+		 * repository would make it impossible to know where
+		 * the actual worktree is if this function is executed
+		 * from another worktree. No .git file support for now.
+		 */
+		strbuf_addf_gently(errmsg,
+				   _("'%s' at main working tree is not the repository directory"),
+				   wt_path.buf);
+		goto done;
+	}
+
+	/*
+	 * Make sure "gitdir" file points to a real .git file and that
+	 * file points back here.
+	 */
+	if (!is_absolute_path(wt->path)) {
+		strbuf_addf_gently(errmsg,
+				   _("'%s' file does not contain absolute path to the working tree location"),
+				   git_common_path("worktrees/%s/gitdir", wt->id));
+		goto done;
+	}
+
+	if (flags & WT_VALIDATE_WORKTREE_MISSING_OK &&
+	    !file_exists(wt->path)) {
+		ret = 0;
+		goto done;
+	}
+
+	if (!file_exists(wt_path.buf)) {
+		strbuf_addf_gently(errmsg, _("'%s' does not exist"), wt_path.buf);
+		goto done;
+	}
+
+	path = xstrdup_or_null(read_gitfile_gently(wt_path.buf, &err));
+	if (!path) {
+		strbuf_addf_gently(errmsg, _("'%s' is not a .git file, error code %d"),
+				   wt_path.buf, err);
+		goto done;
+	}
+
+	ret = fspathcmp(path, real_path(git_common_path("worktrees/%s", wt->id)));
+
+	if (ret)
+		strbuf_addf_gently(errmsg, _("'%s' does not point back to '%s'"),
+				   wt->path, git_common_path("worktrees/%s", wt->id));
+done:
+	free(path);
+	strbuf_release(&wt_path);
+	return ret;
+}
+
+void update_worktree_location(struct worktree *wt, const char *path_)
+{
+	struct strbuf path = STRBUF_INIT;
+
+	if (is_main_worktree(wt))
+		die("BUG: can't relocate main worktree");
+
+	strbuf_realpath(&path, path_, 1);
+	if (fspathcmp(wt->path, path.buf)) {
+		write_file(git_common_path("worktrees/%s/gitdir", wt->id),
+			   "%s/.git", path.buf);
+		free(wt->path);
+		wt->path = strbuf_detach(&path, NULL);
+	}
+	strbuf_release(&path);
+}
+
 int is_worktree_being_rebased(const struct worktree *wt,
 			      const char *target)
 {
diff --git a/worktree.h b/worktree.h
index c28a880..fe38ce1 100644
--- a/worktree.h
+++ b/worktree.h
@@ -3,6 +3,8 @@
 
 #include "refs.h"
 
+struct strbuf;
+
 struct worktree {
 	char *path;
 	char *id;
@@ -59,6 +61,22 @@ extern int is_main_worktree(const struct worktree *wt);
  */
 extern const char *is_worktree_locked(struct worktree *wt);
 
+#define WT_VALIDATE_WORKTREE_MISSING_OK (1 << 0)
+
+/*
+ * Return zero if the worktree is in good condition. Error message is
+ * returned if "errmsg" is not NULL.
+ */
+extern int validate_worktree(const struct worktree *wt,
+			     struct strbuf *errmsg,
+			     unsigned flags);
+
+/*
+ * Update worktrees/xxx/gitdir with the new path.
+ */
+extern void update_worktree_location(struct worktree *wt,
+				     const char *path_);
+
 /*
  * Free up the memory for worktree(s)
  */
diff --git a/wrapper.c b/wrapper.c
index d20356a..1fd5e33 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -445,21 +445,21 @@ FILE *fopen_or_warn(const char *path, const char *mode)
 	return NULL;
 }
 
-int xmkstemp(char *template)
+int xmkstemp(char *filename_template)
 {
 	int fd;
 	char origtemplate[PATH_MAX];
-	strlcpy(origtemplate, template, sizeof(origtemplate));
+	strlcpy(origtemplate, filename_template, sizeof(origtemplate));
 
-	fd = mkstemp(template);
+	fd = mkstemp(filename_template);
 	if (fd < 0) {
 		int saved_errno = errno;
 		const char *nonrelative_template;
 
-		if (strlen(template) != strlen(origtemplate))
-			template = origtemplate;
+		if (strlen(filename_template) != strlen(origtemplate))
+			filename_template = origtemplate;
 
-		nonrelative_template = absolute_path(template);
+		nonrelative_template = absolute_path(filename_template);
 		errno = saved_errno;
 		die_errno("Unable to create temporary file '%s'",
 			nonrelative_template);
@@ -481,7 +481,7 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 	static const int num_letters = 62;
 	uint64_t value;
 	struct timeval tv;
-	char *template;
+	char *filename_template;
 	size_t len;
 	int fd, count;
 
@@ -503,16 +503,16 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 	 */
 	gettimeofday(&tv, NULL);
 	value = ((size_t)(tv.tv_usec << 16)) ^ tv.tv_sec ^ getpid();
-	template = &pattern[len - 6 - suffix_len];
+	filename_template = &pattern[len - 6 - suffix_len];
 	for (count = 0; count < TMP_MAX; ++count) {
 		uint64_t v = value;
 		/* Fill in the random bits. */
-		template[0] = letters[v % num_letters]; v /= num_letters;
-		template[1] = letters[v % num_letters]; v /= num_letters;
-		template[2] = letters[v % num_letters]; v /= num_letters;
-		template[3] = letters[v % num_letters]; v /= num_letters;
-		template[4] = letters[v % num_letters]; v /= num_letters;
-		template[5] = letters[v % num_letters]; v /= num_letters;
+		filename_template[0] = letters[v % num_letters]; v /= num_letters;
+		filename_template[1] = letters[v % num_letters]; v /= num_letters;
+		filename_template[2] = letters[v % num_letters]; v /= num_letters;
+		filename_template[3] = letters[v % num_letters]; v /= num_letters;
+		filename_template[4] = letters[v % num_letters]; v /= num_letters;
+		filename_template[5] = letters[v % num_letters]; v /= num_letters;
 
 		fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
 		if (fd >= 0)
@@ -541,21 +541,21 @@ int git_mkstemp_mode(char *pattern, int mode)
 	return git_mkstemps_mode(pattern, 0, mode);
 }
 
-int xmkstemp_mode(char *template, int mode)
+int xmkstemp_mode(char *filename_template, int mode)
 {
 	int fd;
 	char origtemplate[PATH_MAX];
-	strlcpy(origtemplate, template, sizeof(origtemplate));
+	strlcpy(origtemplate, filename_template, sizeof(origtemplate));
 
-	fd = git_mkstemp_mode(template, mode);
+	fd = git_mkstemp_mode(filename_template, mode);
 	if (fd < 0) {
 		int saved_errno = errno;
 		const char *nonrelative_template;
 
-		if (!template[0])
-			template = origtemplate;
+		if (!filename_template[0])
+			filename_template = origtemplate;
 
-		nonrelative_template = absolute_path(template);
+		nonrelative_template = absolute_path(filename_template);
 		errno = saved_errno;
 		die_errno("Unable to create temporary file '%s'",
 			nonrelative_template);
diff --git a/wt-status.c b/wt-status.c
index f5debcd..50815e5 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -136,6 +136,7 @@ void wt_status_prepare(struct wt_status *s)
 	s->ignored.strdup_strings = 1;
 	s->show_branch = -1;  /* unspecified */
 	s->show_stash = 0;
+	s->ahead_behind_flags = AHEAD_BEHIND_UNSPECIFIED;
 	s->display_comment_prefix = 0;
 }
 
@@ -1032,7 +1033,7 @@ static void wt_longstatus_print_tracking(struct wt_status *s)
 	if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
 		return;
 	branch = branch_get(branch_name);
-	if (!format_tracking_info(branch, &sb))
+	if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
 		return;
 
 	i = 0;
@@ -1187,7 +1188,7 @@ static void abbrev_sha1_in_line(struct strbuf *line)
 		strbuf_trim(split[1]);
 		if (!get_oid(split[1]->buf, &oid)) {
 			strbuf_reset(split[1]);
-			strbuf_add_unique_abbrev(split[1], oid.hash,
+			strbuf_add_unique_abbrev(split[1], &oid,
 						 DEFAULT_ABBREV);
 			strbuf_addch(split[1], ' ');
 			strbuf_reset(line);
@@ -1349,7 +1350,7 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
 					const char *color)
 {
 	status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
-			find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
+			find_unique_abbrev(&state->cherry_pick_head_oid, DEFAULT_ABBREV));
 	if (s->hints) {
 		if (has_unmerged(s))
 			status_printf_ln(s, color,
@@ -1368,7 +1369,7 @@ static void show_revert_in_progress(struct wt_status *s,
 					const char *color)
 {
 	status_printf_ln(s, color, _("You are currently reverting commit %s."),
-			 find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
+			 find_unique_abbrev(&state->revert_head_oid, DEFAULT_ABBREV));
 	if (s->hints) {
 		if (has_unmerged(s))
 			status_printf_ln(s, color,
@@ -1421,7 +1422,7 @@ static char *get_branch(const struct worktree *wt, const char *path)
 		;
 	else if (!get_oid_hex(sb.buf, &oid)) {
 		strbuf_reset(&sb);
-		strbuf_add_unique_abbrev(&sb, oid.hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
 	} else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
 		goto got_nothing;
 	else			/* bisect */
@@ -1458,7 +1459,7 @@ static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
 	if (!strcmp(cb->buf.buf, "HEAD")) {
 		/* HEAD is relative. Resolve it to the right reflog entry. */
 		strbuf_reset(&cb->buf);
-		strbuf_add_unique_abbrev(&cb->buf, noid->hash, DEFAULT_ABBREV);
+		strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
 	}
 	return 1;
 }
@@ -1488,10 +1489,10 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
 		state->detached_from = xstrdup(from);
 	} else
 		state->detached_from =
-			xstrdup(find_unique_abbrev(cb.noid.hash, DEFAULT_ABBREV));
-	hashcpy(state->detached_sha1, cb.noid.hash);
+			xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
+	oidcpy(&state->detached_oid, &cb.noid);
 	state->detached_at = !get_oid("HEAD", &oid) &&
-			     !hashcmp(oid.hash, state->detached_sha1);
+			     !oidcmp(&oid, &state->detached_oid);
 
 	free(ref);
 	strbuf_release(&cb.buf);
@@ -1550,13 +1551,13 @@ void wt_status_get_state(struct wt_status_state *state,
 	} else if (!stat(git_path_cherry_pick_head(), &st) &&
 			!get_oid("CHERRY_PICK_HEAD", &oid)) {
 		state->cherry_pick_in_progress = 1;
-		hashcpy(state->cherry_pick_head_sha1, oid.hash);
+		oidcpy(&state->cherry_pick_head_oid, &oid);
 	}
 	wt_status_check_bisect(NULL, state);
 	if (!stat(git_path_revert_head(), &st) &&
 	    !get_oid("REVERT_HEAD", &oid)) {
 		state->revert_in_progress = 1;
-		hashcpy(state->revert_head_sha1, oid.hash);
+		oidcpy(&state->revert_head_oid, &oid);
 	}
 
 	if (get_detached_from)
@@ -1793,7 +1794,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
 	const char *base;
 	char *short_base;
 	const char *branch_name;
-	int num_ours, num_theirs;
+	int num_ours, num_theirs, sti;
 	int upstream_is_gone = 0;
 
 	color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
@@ -1819,7 +1820,9 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
 
 	color_fprintf(s->fp, branch_color_local, "%s", branch_name);
 
-	if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
+	sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
+				 s->ahead_behind_flags);
+	if (sti < 0) {
 		if (!base)
 			goto conclude;
 
@@ -1831,12 +1834,14 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
 	color_fprintf(s->fp, branch_color_remote, "%s", short_base);
 	free(short_base);
 
-	if (!upstream_is_gone && !num_ours && !num_theirs)
+	if (!upstream_is_gone && !sti)
 		goto conclude;
 
 	color_fprintf(s->fp, header_color, " [");
 	if (upstream_is_gone) {
 		color_fprintf(s->fp, header_color, LABEL(N_("gone")));
+	} else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
+		color_fprintf(s->fp, header_color, LABEL(N_("different")));
 	} else if (!num_ours) {
 		color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
 		color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
@@ -1905,18 +1910,19 @@ static void wt_porcelain_print(struct wt_status *s)
  *
  *    <upstream> ::= the upstream branch name, when set.
  *
- *       <ahead> ::= integer ahead value, when upstream set
- *                   and the commit is present (not gone).
- *
- *      <behind> ::= integer behind value, when upstream set
- *                   and commit is present.
+ *       <ahead> ::= integer ahead value or '?'.
  *
+ *      <behind> ::= integer behind value or '?'.
  *
  * The end-of-line is defined by the -z flag.
  *
  *                 <eol> ::= NUL when -z,
  *                           LF when NOT -z.
  *
+ * When an upstream is set and present, the 'branch.ab' line will
+ * be printed with the ahead/behind counts for the branch and the
+ * upstream.  When AHEAD_BEHIND_QUICK is requested and the branches
+ * are different, '?' will be substituted for the actual count.
  */
 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
 {
@@ -1956,14 +1962,25 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
 		/* Lookup stats on the upstream tracking branch, if set. */
 		branch = branch_get(branch_name);
 		base = NULL;
-		ab_info = (stat_tracking_info(branch, &nr_ahead, &nr_behind, &base) == 0);
+		ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
+					     &base, s->ahead_behind_flags);
 		if (base) {
 			base = shorten_unambiguous_ref(base, 0);
 			fprintf(s->fp, "# branch.upstream %s%c", base, eol);
 			free((char *)base);
 
-			if (ab_info)
-				fprintf(s->fp, "# branch.ab +%d -%d%c", nr_ahead, nr_behind, eol);
+			if (ab_info > 0) {
+				/* different */
+				if (nr_ahead || nr_behind)
+					fprintf(s->fp, "# branch.ab +%d -%d%c",
+						nr_ahead, nr_behind, eol);
+				else
+					fprintf(s->fp, "# branch.ab +? -?%c",
+						eol);
+			} else if (!ab_info) {
+				/* same */
+				fprintf(s->fp, "# branch.ab +0 -0%c", eol);
+			}
 		}
 	}
 
diff --git a/wt-status.h b/wt-status.h
index 3f84d5c..430770b 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -5,6 +5,7 @@
 #include "string-list.h"
 #include "color.h"
 #include "pathspec.h"
+#include "remote.h"
 
 struct worktree;
 
@@ -87,6 +88,7 @@ struct wt_status {
 	int show_branch;
 	int show_stash;
 	int hints;
+	enum ahead_behind_flags ahead_behind_flags;
 
 	enum wt_status_format status_format;
 	unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
@@ -116,9 +118,9 @@ struct wt_status_state {
 	char *branch;
 	char *onto;
 	char *detached_from;
-	unsigned char detached_sha1[20];
-	unsigned char revert_head_sha1[20];
-	unsigned char cherry_pick_head_sha1[20];
+	struct object_id detached_oid;
+	struct object_id revert_head_oid;
+	struct object_id cherry_pick_head_oid;
 };
 
 size_t wt_status_locate_end(const char *s, size_t len);
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 770e1f7..9315bc0 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -191,7 +191,7 @@ void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
 		return;
 	}
 
-	ptr->ptr = read_sha1_file(oid->hash, &type, &size);
+	ptr->ptr = read_object_file(oid, &type, &size);
 	if (!ptr->ptr || type != OBJ_BLOB)
 		die("unable to read blob object %s", oid_to_hex(oid));
 	ptr->size = size;